merge of '77de2c054faaf8169bea5553ae2311a39a581403'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 14 Aug 2008 23:48:23 +0000 (23:48 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 14 Aug 2008 23:48:23 +0000 (23:48 +0000)
     and 'fd59ca4a2d1cdb56a15d6a3323721ce78836fe52'


Trivial merge