Ah, excellent news! Yes, my contribution is under the same license as your code, GPL version 2 or later. As for the bundling problem, we can approach that in multiple ways. If you can make your changes public (post patches on a web site, for example), I can see whether we can simply adopt them into ...