tree 202384e69a3a584a487dd81131fc21a990950590
parent ffbcf612fdfaca1de219391292981c4c83b04d66
author Bill Wendling <isanbard@gmail.com> 1301188629 +0000
committer Bill Wendling <isanbard@gmail.com> 1301188629 +0000

Merge r128168 to unbreak test.


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