merge of '0e150443d291bc62c30745eee41a34a08f3eb3db'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Jul 2007 12:01:08 +0000 (12:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 4 Jul 2007 12:01:08 +0000 (12:01 +0000)
     and '1b058511a74a92f00fa349a145e6d36bc37c7e21'


Trivial merge