merge of '0d0649342cfba110eb1f0f2d062937f0ad35f01a'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 13:18:49 +0000 (13:18 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 22 May 2007 13:18:49 +0000 (13:18 +0000)
commit8c205f59a005b80b862128762e9a516fa5e5075d
treec09b3f4c44fed1232c183c39cb7fb01d9e78f1db
parent6b76b8f297a3051e939c2a6fb6b04266f3e0f77c
parent5fcee105f7b5be41d4876e2841385924e28a74bc
Merge ... '0d0649342cfba110eb1f0f2d062937f0ad35f01a'
     and 'ce488c58945db30380bd769b2a12de11d56a8a91'