tree 112c1898927520db126d23a284c533f1e7eb0dbe
parent 53b947dca92f78c6a8b87df82f600b71f67f25a2
author Tanya Lattner <tonic@nondot.org> 1190397144 +0000
committer Tanya Lattner <tonic@nondot.org> 1190397144 +0000

Merge from mainline for PR1693.

llvm-svn: 42201