Merge [58275], [58306] to release.

[SVN r58380]
This commit is contained in:
Peter Dimov
2009-12-14 17:44:19 +00:00
parent ec6ef33639
commit b9c25e97e1