merge of 'b943092a679d2bbcfefdf0a6584665f2007e24ca'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 9 Jan 2007 15:54:13 +0000 (15:54 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 9 Jan 2007 15:54:13 +0000 (15:54 +0000)
     and 'da75410541d11331c9c223c0996c59d613032d01'


Trivial merge