Comment # 2 on bug 1116055 from Josef M�llers

Please have a look at the files and adapt them appropriately.

Feel free to contact me if you have any questions.

Thanks.