Merging r155342:

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_31@155374 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling committed 2012-04-23 18:32:40 +00:00
1 parent 6e1ddf6dd3
commit 889cbeeac4

Diff Content Not Available