am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures.

Merge commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c' into eclair-mr2

* commit 'ea48cd6dd4e64bcb5c840a12fe052f704510e01c':
  Use a diff that ignores trailing whitespaces to get by some layout test failures.