tree dd6b1cb579d7aea00b3997034abb9d4a1ce69fec
parent 1f3405800a99939005fd5d27b712e08ecceb5975
author Bill Wendling <isanbard@gmail.com> 1337119568 +0000
committer Bill Wendling <isanbard@gmail.com> 1337119568 +0000

Merge in 156319 156837 156838.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_31@156863 91177308-0d34-0410-b5e6-96231b3b80d8