merge of '4758ca456d2363e1b00659c33da6c72ea4ac3074'
authorHolger Freyther <zecke@selfish.org>
Tue, 8 Jan 2008 08:56:06 +0000 (08:56 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 8 Jan 2008 08:56:06 +0000 (08:56 +0000)
commit130c765e5e66d957ad943b91c9b6ad77306ba310
treed3bce0d3825f0b3eedea3f5f3dec25d360413fd8
parenta99004bdc6d8c65c0b5dceaef78768b230ddcb7e
parent460978eb9e5ff4de83446a92096d65fa804b6d7b
Merge ... '4758ca456d2363e1b00659c33da6c72ea4ac3074'
     and 'e2c29cfbd284f015d3c4165234bbaf65c184d38d'