merge of '1a4a3b2be416c7c4f63918779f9d0ee5704745df'
authorHolger Freyther <zecke@selfish.org>
Thu, 17 Aug 2006 14:51:43 +0000 (14:51 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 17 Aug 2006 14:51:43 +0000 (14:51 +0000)
     and 'cbcfc49a8bb1a943b0aa9d318c6b651da34d5c0e'


Trivial merge