Since the new file is rather big, I'm sending it as a separate bzipped patch.

Regards,
Dimitar