merge of '89cd2556ac06a9a9dd5fe232a734dec9569772da'
authorHolger Freyther <zecke@selfish.org>
Sun, 18 Feb 2007 16:03:42 +0000 (16:03 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 18 Feb 2007 16:03:42 +0000 (16:03 +0000)
     and 'c416a7368aa98390e48b2c8eed6650147874a490'


Trivial merge