merge of '151f96332675f5008c225f4aa580dcaaea8f04f8'
authorHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 09:17:12 +0000 (09:17 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 09:17:12 +0000 (09:17 +0000)
     and '89e38da8206b15620ba7c2bef11c31e2dda99dd8'


Trivial merge