tree e758ce9e0731c50b47ea5ff0fd76eb2ccd7555d9
parent c7e03921e4cffcb730f4bab81801c81512d282ca
author Tanya Lattner <tonic@nondot.org> 1252098809 +0000
committer Tanya Lattner <tonic@nondot.org> 1252098809 +0000

Merge 80424 from mainline.
Fix invalid conversion

llvm-svn: 81043