Tue, 13 Feb 2007 13:45:36 +0000 Florian Pose MERGE -r759:762 trunk -> branches/stable-1.2 (release 1.2, part two). stable-1.2