tree 03190365b1446c767bfa64077ccb3ba25c2e2ff1
parent cbb28840351d8de2c07940901d7071e157a48679
author Stuart Hastings <stuart@apple.com> 1285018399 +0000
committer Stuart Hastings <stuart@apple.com> 1285018399 +0000

Merge r112674 into Morbo.  Radar 8305081.

llvm-svn: 114359