merged [71740] and [71739] from trunk

[SVN r71741]
This commit is contained in:
Eric Niebler 2011-05-05 17:17:28 +00:00
parent a9d612c952
commit e990c9da9a

@ -1 +1 @@
Subproject commit 313dd379f1729efe19fa5cd7c254e2b081ed25dd
Subproject commit d438ad3bfe54736b58c5e2d03445a5a58f83268d