merge of '51c8bec079d3bd6ef15c2674a76e2fd007e47122'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 23 May 2008 20:34:16 +0000 (20:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 23 May 2008 20:34:16 +0000 (20:34 +0000)
     and 'a4c7fdea302dedfc9dc32cbc08963aabe21f38b8'


Trivial merge