merge of '397294e12f174d25745f5b3b591468ffd54fec4d'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 8 Oct 2007 17:07:10 +0000 (17:07 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 8 Oct 2007 17:07:10 +0000 (17:07 +0000)
     and 'e8e5e906fda8d6117edc8f3082056c7d690921a7'


Trivial merge