Fri, 16 Dec 2011 16:31:40 +0100merge stable-1.5
Florian Pose <fp@igh-essen.com> [Fri, 16 Dec 2011 16:31:40 +0100] rev 2179
merge