merge 3.2

This commit is contained in:
Benjamin Peterson 2011-06-27 09:19:02 -05:00
commit 345a5d7357
2 changed files with 6 additions and 6 deletions