merge of '56b25a110aa475e3158b4ad35b8444a1da0716cb'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 29 Mar 2007 19:37:50 +0000 (19:37 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 29 Mar 2007 19:37:50 +0000 (19:37 +0000)
     and '5a68fd7dd4ea1b818537db754ddc0d7ad79ca66b'


Trivial merge