merge 3.2

This commit is contained in:
Benjamin Peterson 2011-06-27 17:51:44 -05:00
commit b37db00c46