Merges patches from Trunk.

[SVN r64697]
This commit is contained in:
John Maddock 2010-08-09 16:45:17 +00:00
parent 5817accf9f
commit 1f1b7d7a94

@ -1 +1 @@
Subproject commit c54f6104975576173e23e76bc893bdf5fc7ada19
Subproject commit 8cd15f2ded49a4b7686ba43bb901d974d18bd39a