Fri, 30 Nov 2012 20:25:18 +0100merge stable-1.5
Florian Pose <fp@igh-essen.com> [Fri, 30 Nov 2012 20:25:18 +0100] rev 2454
merge