tree 1ef003b201903ab73f5dcbe6a6059fd6a6ad4c53
parent 3a3d1eff5c9bca13a2b8b9594699f92bb566698c
author Tanya Lattner <tonic@nondot.org> 1190397144 +0000
committer Tanya Lattner <tonic@nondot.org> 1190397144 +0000

Merge from mainline for PR1693.


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