merge of '5c04010dc0ca86da15eacb212b5845c24d73eb1e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:16:53 +0000 (14:16 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:16:53 +0000 (14:16 +0000)
     and 'b530b781e2597a57e49d9d02d956a75f0617c9a8'


Trivial merge