merge of 'b27ad9ec4f0d5643c56c77358b7e886841ea363d'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 07:32:34 +0000 (07:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 07:32:34 +0000 (07:32 +0000)
commite01cf09e9666bf12ccde929e942e98ad4a150264
tree952b3d3739dc6b1fadf3217c69ddbe5558d296e3
parente77d902b1e761e250f98a30ea72175195315523f
parent2aa8d253db20741bf48d6840cab187f42d9029cf
Merge ... 'b27ad9ec4f0d5643c56c77358b7e886841ea363d'
     and 'f545cd4511e822868b1f61763ab488576a4945ce'