merge 3.1

This commit is contained in:
Benjamin Peterson 2011-05-27 14:17:19 -05:00
commit a290bac5b1