merge of '1549b0afc63f5679fb6877ec547a593b858995b3'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 23 Aug 2007 09:23:26 +0000 (09:23 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 23 Aug 2007 09:23:26 +0000 (09:23 +0000)
     and '6cbb49635ec4afa8bf5ebeada5a97affa422d676'


Trivial merge