Wed, 13 Jan 2010 00:04:47 +0100merge stable-1.4
Florian Pose <fp@igh-essen.com> [Wed, 13 Jan 2010 00:04:47 +0100] rev 1769
merge