Merge trunk; 3 code fixes, 1 doc fix

[SVN r69521]
This commit is contained in:
Beman Dawes 2011-03-03 18:00:21 +00:00
parent 5372eadd1a
commit d45db970d9

@ -1 +1 @@
Subproject commit 0853dd535f7c1200f152492c2cd9333a31bbd97d
Subproject commit 938490e164679fc4bfcb855edb70092abcaa0bf1