merge of '30d6a9a8f183fa3269a65f234e3bf92f0da8eff5'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 16 Nov 2007 18:24:30 +0000 (18:24 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 16 Nov 2007 18:24:30 +0000 (18:24 +0000)
commit69a8b4053ee2673dad2a1255adc59bc1fb2bca29
tree07cf5b4ab895453fb06b58c864cb22161fb12ebc
parent634e2b7f84c19f313cf07e27ec68be0ebe80fab0
parent251397b8ed8ca5e809b3eaf35baa976f0ca479c4
Merge ... '30d6a9a8f183fa3269a65f234e3bf92f0da8eff5'
     and '63a3f2a77fbdf77ef9318ceb182fd3be38d68562'