merge of '4213de3ffd14e7cf6ceeabc6b2c47a76575ff89e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 16 Jul 2007 11:48:01 +0000 (11:48 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 16 Jul 2007 11:48:01 +0000 (11:48 +0000)
     and 'ea6fbf0b5697e9ae66409f2f0cfb84269eca8a2e'


Trivial merge