Merge minor fixes from Trunk.

[SVN r60694]
This commit is contained in:
John Maddock 2010-03-18 16:57:43 +00:00
parent 8f0c2b723a
commit f608e83d3a

@ -1 +1 @@
Subproject commit 7cd9227cbabadf515a265555b9ed1cf15df3267d
Subproject commit bb9fc4cfaf9a5f8e747564fa3928cf67daa782fa