merge of '52333e2ff8a0a55bff7597d29b54ad3d0e836033'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Jan 2008 11:42:27 +0000 (11:42 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Jan 2008 11:42:27 +0000 (11:42 +0000)
     and '7164da9fb8de274ee480409ef0b6ce02db5de39b'


Trivial merge