merge [74474] from trunk, fixes #5648

[SVN r74475]
This commit is contained in:
Eric Niebler 2011-09-20 02:34:48 +00:00
parent 90e7b2869a
commit 9ecf507147

@ -1 +1 @@
Subproject commit 6091dbb049fac41e6430733bc37d58e9ebb04c60
Subproject commit 47dfc6bea042f3df40c0d4a1d0125df32ce012c8