Fri, 13 May 2011 15:35:14 +0200Merge.
Florian Pose <fp@igh-essen.com> [Fri, 13 May 2011 15:35:14 +0200] rev 2069
Merge.

Fri, 13 May 2011 15:34:20 +0200Merge.
Florian Pose <fp@igh-essen.com> [Fri, 13 May 2011 15:34:20 +0200] rev 2068
Merge.