merge of '3a9c0f4a00528662d37b097973dd3b51287562c4'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 12 Jan 2008 00:40:21 +0000 (00:40 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 12 Jan 2008 00:40:21 +0000 (00:40 +0000)
     and '841845db4cfff04ccff4ec075f181561fb3ad63f'


Trivial merge