merge of '038512d47d170566799a85daf9e937b4f9e673a0'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 10 Apr 2007 16:42:42 +0000 (16:42 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 10 Apr 2007 16:42:42 +0000 (16:42 +0000)
     and 'cd0b184ac8d7d7c25e329cc8419c3d8a36cbfd22'


Trivial merge