Merge fixes from Trunk.

[SVN r62832]
This commit is contained in:
John Maddock 2010-06-12 08:33:32 +00:00
parent 37f3e7abba
commit f5df511f92

@ -1 +1 @@
Subproject commit 730be18188c4c073c35f941fc9248693287d9e17
Subproject commit e3da9260e1b3c252219e411aba32fd5852671798