Merge format from the trunk. This should fix the regressions resulting from the partial merge in [63640].

[SVN r63794]
This commit is contained in:
Steven Watanabe 2010-07-09 20:27:18 +00:00
parent f0263bd799
commit f3f5859c6f

@ -1 +1 @@
Subproject commit 3b7bf2dff61ee32fd89dd69e9d5b673f0ed89173
Subproject commit 0bcaf671d6002509b4031cb8ed66afd2338be692