merge of '4a7a14fac99e1af17265980554b9c5390863c35b'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 8 Mar 2008 22:45:36 +0000 (22:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 8 Mar 2008 22:45:36 +0000 (22:45 +0000)
     and 'd06ab8ea3c49e1734c6984d23d283558d4aef52c'


Trivial merge