Since we'll have to do it to land in mozilla-central anyway, do you mind taking a pass through and removing the trailing whitespace?  this patch seems to have acquired a bunch somehow.  thanks!