Merge updates from Trunk

[SVN r58764]
This commit is contained in:
John Maddock 2010-01-06 13:08:49 +00:00
parent c158617b72
commit 307b95f3e8

@ -1 +1 @@
Subproject commit 87511233de9d05c9299f7ba08095dc24304eb904
Subproject commit 5e3d75e6fb50dd18a9e8602f33bf7399a32c5641