merge of '616de078e37b5586f22bd5a29a7e83e7bdc21ef0'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 31 Mar 2007 23:13:15 +0000 (23:13 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 31 Mar 2007 23:13:15 +0000 (23:13 +0000)
     and 'df91b721b12e4cd0018efb48100850f6be22ce15'


Trivial merge