merge of '0ffedb7c7f00db7f23e28aec3cbb44abdd01876f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Sep 2007 11:06:30 +0000 (11:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Sep 2007 11:06:30 +0000 (11:06 +0000)
     and '350212948f342818ac60fcc5f0cfe013dd157774'


Trivial merge