Merge [51239] and [51961] from the trunk.

[SVN r52424]
This commit is contained in:
Steven Watanabe 2009-04-16 18:11:23 +00:00
parent 32f463a91b
commit 39edab5a2b

@ -1 +1 @@
Subproject commit 704fba0260af97b17b4582c3f9352c6e5c53fb1b
Subproject commit f88cfb1f1ccc52c02bb8cb3fb35b7210b6857cb8