merge of '514f567825ae8e6637db7739ff19922824ab5430'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Feb 2007 15:26:03 +0000 (15:26 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Feb 2007 15:26:03 +0000 (15:26 +0000)
     and '8894b322de91da59f93eca5d1068d1582c805fa9'


Trivial merge