merge of '2e36c8f0c56f59ea677a4fe8814a5a2db0728380'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 09:22:19 +0000 (09:22 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 09:22:19 +0000 (09:22 +0000)
     and '3bbd9735ce9ed4fbb5306c2f3ec8720768f407eb'


Trivial merge