merge of 'c0b80d25e48faf3cabe4d83d5586401a0a5e1188'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Jul 2008 10:04:40 +0000 (10:04 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Jul 2008 10:04:40 +0000 (10:04 +0000)
     and 'c5251d02ae821f28febfb91fb76af9cd01b8f3fd'


Trivial merge