Block merge of r1342, r1344 from rel-1.1-maint. Changes have been applied manually to the trunk.

This commit is contained in:
rjy7 2010-09-08 13:47:56 +00:00
parent 5484036ee9
commit d8789cfc67

Diff content is not available