merge of 'a313b4ef183dbf50cfe3226664e5f17033c03dc2'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 30 Mar 2007 10:12:59 +0000 (10:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 30 Mar 2007 10:12:59 +0000 (10:12 +0000)
     and 'add776e24ed7d1a9c84f1664e221cb0970fa98ff'


Trivial merge