Merging r195941:
authorBill Wendling <isanbard@gmail.com>
Sun, 1 Dec 2013 04:34:31 +0000 (04:34 +0000)
committerBill Wendling <isanbard@gmail.com>
Sun, 1 Dec 2013 04:34:31 +0000 (04:34 +0000)
commit343f2c6d0a7ff1c7fb3aea48e8c2eaa3373c1bcc
tree2f0ac72a1d91b6b242a14fcac635ab3c81d1b3d8
parent4bb8fe374570cc453f10935bdc81b4083f09d2ff
Merging r195941:
------------------------------------------------------------------------

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