merge of '68a7e26996faf9485b677d7a33ff7d762732355a'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Mar 2007 12:47:35 +0000 (12:47 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Mar 2007 12:47:35 +0000 (12:47 +0000)
     and 'a33060785662f1407a1d47f9e23df18b384ec12b'


Trivial merge