Merge missing changes from Trunk.

Authorized by Daniel James.

[SVN r72800]
This commit is contained in:
John Maddock 2011-06-29 18:00:59 +00:00
parent 069a9ed69e
commit 8bbedf1d42

@ -1 +1 @@
Subproject commit a4c133c6cee74b6fce4fb65baa973ccfeff7a4f0
Subproject commit 72e2d4c24fb0edab8f567d5349b784763db97b12