Merge from 3.2

This commit is contained in:
Nick Coghlan 2011-05-06 00:03:49 +10:00
commit cb395187d0