Merge [44825] and [45264] from the trunk.

[SVN r70796]
This commit is contained in:
Steven Watanabe 2011-03-31 19:47:42 +00:00
parent ab2e125c30
commit 8a4f90e8bf

@ -1 +1 @@
Subproject commit 9275e2b8aa7b5a882fb7ec5816f5b94d2056dd9e
Subproject commit 6ed68269a8ad8f2b560e6e900bd0fb4012069fdd