Merge fixes in Trunk.

[SVN r83956]
This commit is contained in:
John Maddock 2013-04-18 15:52:11 +00:00
parent 09b169cefb
commit 2db0b637ab

@ -1 +1 @@
Subproject commit 8039f6e7ac20c4ca67eba212b1600e570904cdf8
Subproject commit 337afc03beac194d2659caf3ed371594199e3369