merge 3.2

This commit is contained in:
Benjamin Peterson 2012-01-03 16:48:14 -06:00
commit 332503db07