tree 6fed9916c82d8bd45abecb68462ebb6cdbac9942
parent 1b871840be436b0099be0ece01b3dd2701d18e35
author Tanya Lattner <tonic@nondot.org> 1321515632 +0000
committer Tanya Lattner <tonic@nondot.org> 1321515632 +0000

Merge r143770 from mainline to fix MSVC build.

llvm-svn: 144894