merge of '113174d33136a54f14b81e89817064146ea7422c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 29 Mar 2007 14:55:17 +0000 (14:55 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 29 Mar 2007 14:55:17 +0000 (14:55 +0000)
     and 'e537e43379a96a77d936e5011051050129d6a7f9'


Trivial merge