Mon, 14 Dec 2009 13:11:36 +0100 Florian Pose Merged changes from Martin Troxler.