Mon, 25 Jul 2011 10:32:46 +0200merge.
Florian Pose <fp@igh-essen.com> [Mon, 25 Jul 2011 10:32:46 +0200] rev 2090
merge.

Mon, 25 Jul 2011 10:30:34 +0200Removed unused variables.
Florian Pose <fp@igh-essen.com> [Mon, 25 Jul 2011 10:30:34 +0200] rev 2089
Removed unused variables.