tree c9e657b941aded89f8e0289b68acb67fd2d7676f
parent 25a3c4bab99719267fb0cbb9b91816f9922055e3
author Tanya Lattner <tonic@nondot.org> 1190397028 +0000
committer Tanya Lattner <tonic@nondot.org> 1190397028 +0000

Merge into release for PR1690.


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