merge of '4d01e12fde33f43c99f3c6215f4514d9f9d24479'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Jul 2007 08:12:45 +0000 (08:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Jul 2007 08:12:45 +0000 (08:12 +0000)
commit378a7e927649dcfaab9e0e54a1dc3c106724ecd3
tree701dd94bbe081cbec38cf9e421391d37dbc37af1
parentdfcf279e7b654887d36c3763ddc91890b47b1044
parent0aad8b50511c04a4dfda2b43d4e450c3b4b9a9fb
Merge ... '4d01e12fde33f43c99f3c6215f4514d9f9d24479'
     and 'aa44d626baaae40ee498aea453176a8aea90d9fc'