tree 9ed75aa73b122f72131814878a4f74a2dee90cdb
parent 2f0727401c1b30f80f9fcb603cf388522ca8d73c
author Tanya Lattner <tonic@nondot.org> 1321515632 +0000
committer Tanya Lattner <tonic@nondot.org> 1321515632 +0000

Merge r143770 from mainline to fix MSVC build.


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