Merge r3344 from release 1.3 branch

This commit is contained in:
j2blake 2011-07-20 20:30:57 +00:00
parent 1d151e27bc
commit 9f566a7310

Diff content is not available