Automated merge with https://hg.berlios.de/repos/gavrog
Automated merge with https://hg.berlios.de/repos/gavrog

BackupTheBerlios/gavrog,BackupTheBerlios/gavrog,BackupTheBerlios/gavrog,BackupTheBerlios/gavrog,BackupTheBerlios/gavrog