Sun, 06 Jun 2010 21:15:17 +0200 Florian Pose merge
Sun, 06 Jun 2010 21:07:36 +0200 Florian Pose Minor change.