merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Nov 2007 15:16:38 +0000 (15:16 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Nov 2007 15:16:38 +0000 (15:16 +0000)
     and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'


Trivial merge