merge of '44766714d588caf0607b7f0e513a17f06efead43'
authorHolger Freyther <zecke@selfish.org>
Mon, 19 Feb 2007 17:01:12 +0000 (17:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 19 Feb 2007 17:01:12 +0000 (17:01 +0000)
     and '7eec4d1323cba61be89ecb9fa8d18fca19b81780'


Trivial merge