Tue, 10 Apr 2012 19:10:56 +0200merge. stable-1.5
Florian Pose <fp@igh-essen.com> [Tue, 10 Apr 2012 19:10:56 +0200] rev 2378
merge.