merge of '377e4d7bcf91440bd806ee920d1b7ff72c44b991'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Jul 2008 00:21:09 +0000 (00:21 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Jul 2008 00:21:09 +0000 (00:21 +0000)
     and '4e488d5362b8ca358d51ff94ae13612013485641'


Trivial merge