I accidentally sent the patch to the wrong mailing list and was pointed
to this one (thanks Tobias!).

I've attached the patch to this email as well (this time using git
format-patch instead of git diff -u).