merge of 'ed2d98bad995f47d5d9407c6f6042a4a0a16e4e8'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 09:38:10 +0000 (09:38 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 09:38:10 +0000 (09:38 +0000)
     and 'f79e480392084bdbae07670461327da526458d3c'


Trivial merge