Merge r64579 | steven_watanabe | 2010-08-03 21:46:19 +0400 (Tue, 03 Aug 2010)
Make print more robust. This should fix the regression test failure.