Merge r71717 from trunk

[SVN r71718]
This commit is contained in:
Douglas Gregor 2011-05-04 17:56:03 +00:00
parent 486471155f
commit a9d612c952

@ -1 +1 @@
Subproject commit e93603d33e654ecdccb0b65ed6ad3715228d9cb5
Subproject commit ed737a9a6f33467c7091ea7976b4ec443da996c6