Merge from trunk

[SVN r79274]
This commit is contained in:
Joel de Guzman 2012-07-05 04:40:37 +00:00
parent 3e78bc5d51
commit 154414df85

@ -1 +1 @@
Subproject commit bcb5fd9618f7bd8efbe12f1c3ecda7dc37442212
Subproject commit 5a51e5d9aa4b8a30b7c58937adc93a796b883ac0