Merged from trunk to release. Fixes #4089.

[SVN r61278]
This commit is contained in:
Frank Mori Hess 2010-04-14 20:30:37 +00:00
parent 69fcaf21ab
commit dca8d623a6

@ -1 +1 @@
Subproject commit 2883e211203be4853e6c40eacdef6db3bc3671e0
Subproject commit 0f76cd72f150048d530ed43c616e25e7ba4da940