Mon, 14 Dec 2009 13:25:50 +0100 Florian Pose Merged changes by Martin Troxler.