Comment 22 for bug 1272316

I've backported this to rel_2_4.

Here's a general tip for backporting things like this, which cross a mass tab/space whitespace cleanup, and so don't pick clean with just git tools. With your commit hash in hand, from the top of your working tree, do this:

 $ git log --pretty=oneline --patch b2c70c5^..b2c70c5 | patch -p1 -l --dry-run

The -l switch tells patch to ignore whitespace differences. If you get no errors, you can remove the --dry-run part to apply the patch and duplicate the commit metadata from the original commit message. git-commit takes a --author switch to help you lie about the authorship, and signoffs are really just strings recognized by convention inside the commit message.