Merging fixes for #3909 to release branch

[SVN r68077]
This commit is contained in:
Marshall Clow 2011-01-13 01:46:49 +00:00
parent 9733c8b4cf
commit 38241eb4a8

@ -1 +1 @@
Subproject commit ec3192a6c88fa83349f804a0e4715102f52e7342
Subproject commit cf09cfde1f4a2b6a0195f831184bc8fe11111071