merge of '69a166c7072b74d6a2c00aef7ecebacee3e1706a'
authorHolger Freyther <zecke@selfish.org>
Mon, 21 Jan 2008 11:11:58 +0000 (11:11 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 21 Jan 2008 11:11:58 +0000 (11:11 +0000)
     and '8b72081ac43d603c1378f0c3e6589903e1fe2231'


Trivial merge