Merge with 3.2

This commit is contained in:
Terry Jan Reedy 2013-03-17 15:28:52 -04:00
commit b271727bad