Merge fixes for test_output from the trunk.

[SVN r68625]
This commit is contained in:
Steven Watanabe 2011-02-03 17:22:34 +00:00
parent 87fcf76bd3
commit 6302d80c71

@ -1 +1 @@
Subproject commit 0af318d14ca6f03c8b32b2f2ea5d4eaa9bda05e1
Subproject commit 7f5192f0fac2851a9e377e3d2af249d439daef9f