Merging r195905:
authorBill Wendling <isanbard@gmail.com>
Sun, 1 Dec 2013 04:32:59 +0000 (04:32 +0000)
committerBill Wendling <isanbard@gmail.com>
Sun, 1 Dec 2013 04:32:59 +0000 (04:32 +0000)
commit8069ce4f90cfcc2ecfe3f3a498753fa7083f0dad
tree515d72af699c3745c99ed921b9c7719d475fed8a
parentb259bafae4c170106b137ee77df6a8ea11c7cd1a
Merging r195905:
------------------------------------------------------------------------

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