Merge with 3.2 whitespace

This commit is contained in:
Terry Jan Reedy 2012-01-31 02:58:39 -05:00
commit 5d605c2861