merge of '3fa76fd2a4646a878f0810156dec4b7da94c14f2'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 6 Dec 2006 10:55:45 +0000 (10:55 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 6 Dec 2006 10:55:45 +0000 (10:55 +0000)
     and 'ee31c6e3fc63b93eae8552042728645a8206cf1c'


Trivial merge