merge of 'd99c8702df0201605c294d4a9f65791562789838'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Jul 2008 17:31:37 +0000 (17:31 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 Jul 2008 17:31:37 +0000 (17:31 +0000)
     and 'e4aab546c3b33577e2fb6bcfe199da5a98b4a9a3'


Trivial merge