This is basically the upstream diff, minus autotools cruft and translations, which looks much more palatable
This is basically the upstream diff, minus autotools cruft and translations, which looks much more palatable