merge of 'aa327bc6909e97c6358a09ecd6fca8e61ae204e7'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:28:15 +0000 (14:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:28:15 +0000 (14:28 +0000)
     and 'c0a3e474625678b13727e12b833983f6e3389de1'


Trivial merge