Thu, 16 Sep 2010 10:16:12 +0200Merge.
Florian Pose <fp@igh-essen.com> [Thu, 16 Sep 2010 10:16:12 +0200] rev 1963
Merge.