merge of '0d0649342cfba110eb1f0f2d062937f0ad35f01a'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 13:18:49 +0000 (13:18 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 13:18:49 +0000 (13:18 +0000)
     and 'ce488c58945db30380bd769b2a12de11d56a8a91'


Trivial merge