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)
     and 'e2c29cfbd284f015d3c4165234bbaf65c184d38d'


Trivial merge