Merge fixes from Trunk.

Fixes #4721.

[SVN r66116]
This commit is contained in:
John Maddock 2010-10-20 12:11:18 +00:00
parent b1dd3f747c
commit bf7c73225a

@ -1 +1 @@
Subproject commit cfedb491106dd349ef826bf175d8fc9cc898ae98
Subproject commit 717042387085a92dee0c801e6edfd8c3187ad77f