Further reduce the diff against upstream, import the whitespace changes by sobrado@.

"Thu Nov 28 10:33:37 2013 UTC
remove trailing whitespaces; use tabs instead of spaces where
appropriate;
no binary changes."
/sobrado/