Merge whitespace fix from 3.2.

This commit is contained in:
R David Murray 2011-03-13 22:49:44 -04:00
commit 74fb7601ba