merge of 'e348a5573be571fc7921f8e7107bb19524bc4d19'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Mar 2007 08:34:47 +0000 (08:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Mar 2007 08:34:47 +0000 (08:34 +0000)
     and 'eed92511644ccf0e7578d47078f6c89307ea997a'


Trivial merge