merge of '623ea3aff033ebbbbf8a8a9524a46a58768afed1'
authorHolger Freyther <zecke@selfish.org>
Fri, 19 Jan 2007 13:30:40 +0000 (13:30 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 19 Jan 2007 13:30:40 +0000 (13:30 +0000)
     and 'a883397cbf4a34b6feb952e04840485ff88c15cd'


Trivial merge