merge of '0bce6a5194a4bb1f18f55b0dffee505b24073d3f'
authorHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 12:39:52 +0000 (12:39 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 12:39:52 +0000 (12:39 +0000)
     and '808dfc9a89643b5a9911166b217da753005549e9'


Trivial merge