merge 3.2

This commit is contained in:
Benjamin Peterson 2011-06-20 22:09:20 -05:00
commit 28db0fd357