Merge fixes to release; Fixes #1674

[SVN r72330]
This commit is contained in:
Marshall Clow 2011-06-01 15:55:38 +00:00
parent ec397f5736
commit c44579991a

@ -1 +1 @@
Subproject commit 72eb4479ea5a034f268e79058795f575fae769e0
Subproject commit 7f89ef42b6b9bb3612d7eb959e9b75022a91e33c