Merge from trunk. Fixes #6655

[SVN r79273]
This commit is contained in:
Frank Mori Hess 2012-07-05 01:44:38 +00:00
parent bd3982f29d
commit 3e78bc5d51

@ -1 +1 @@
Subproject commit 5ef07b97a7a1e730b65c94013e6113792bac3606
Subproject commit f3dda674590124b06a4e390f0e5bf47d5bdfdc57