merge of '72e4dc922a7829f373c983065e7bb1c5d196fee4'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 12 Oct 2007 15:33:55 +0000 (15:33 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 12 Oct 2007 15:33:55 +0000 (15:33 +0000)
     and 'ab9fe91feff93a6291ef602e0d4c6867eb4eb8c9'


Trivial merge