merge of '1d81bf38470b2447c375082a9a8b46bfeb3e76b3'
authorHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 21:01:12 +0000 (21:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 21:01:12 +0000 (21:01 +0000)
     and '4d6a07a1830f155b9a2a7a992d78b6bf7d7c18f2'


Trivial merge