merge 3.2

This commit is contained in:
Benjamin Peterson 2011-05-27 14:17:35 -05:00
commit d8255e0e9e