merge of '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 30 Jul 2007 21:33:56 +0000 (21:33 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 30 Jul 2007 21:33:56 +0000 (21:33 +0000)
commit673c15addeb79e8333ac0dd770f2332e6dba59ce
treeb9c79261b428319f524c6a1993cf3a7315c9a8e7
parent05acd69e35b3436cfa279c369239cdbb396f0143
parent324be71ba892169601aab133040329b62992ac88
Merge ... '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
     and 'aaed7d89c2d2f9469b923a2d2d65c83ad37bc838'