Merge mostly cosmetic fixes from Trunk

[SVN r62834]
This commit is contained in:
John Maddock 2010-06-12 09:55:44 +00:00
parent 1ef8490f36
commit 8ee4f45976

@ -1 +1 @@
Subproject commit bb9fc4cfaf9a5f8e747564fa3928cf67daa782fa
Subproject commit 60ba70f9a01895dbfe08c46463143e0b1ec034a7