Record the manual merge of r2237 from the release 1.2 maintenance branch.

This commit is contained in:
jeb228 2011-01-17 15:21:39 +00:00
commit 4a21c4b7e4

Diff content is not available