Attached is a bzr bundle for the modifications.

Regards
Yves