I'm sorry, I commented these two patches to be contributed by Alan and not from you. I hope it's ok. If not I add an additional comment that these two patches are from you.
It would be nice to fix the comment, of course. I don't know how to do that with CVS, whithout commiting another modification.
However, it is not a big issue, as it does not affect the compiled sources ! Vincent