merge of '4fb1a7447c5d8ace96a5ac6358c7fe10f0d951c4'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 30 Aug 2007 15:29:13 +0000 (15:29 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 30 Aug 2007 15:29:13 +0000 (15:29 +0000)
     and '969fb79142680f77b64829b367c495c5836d4327'


Trivial merge