Merge patches from Trunk.

[SVN r60622]
This commit is contained in:
John Maddock 2010-03-15 17:55:47 +00:00
parent 0853edb69a
commit a43ce5b30c

@ -1 +1 @@
Subproject commit 7254d6c9c832f7b3179655640f755fae1e4daeb4
Subproject commit 027571bf6e68156e721abdd22aa340d53f3f346c