merge of '2c4ce910697bba06555153194e59aa010346bb7c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 2 Aug 2007 15:23:39 +0000 (15:23 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 2 Aug 2007 15:23:39 +0000 (15:23 +0000)
     and '8b8fb841c5173c325347c89a0c911e34aff7fdd3'


Trivial merge