merge 3.2

This commit is contained in:
Benjamin Peterson 2011-05-27 14:12:53 -05:00
commit 4a0f20f5a3