merge of '2b9fbd2b94d0dd1a3b6560f1e64c3ba54d0491c9'
authorHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 15:58:15 +0000 (15:58 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 15:58:15 +0000 (15:58 +0000)
     and 'a1ada670e1090a4a0d8aeca19ac7ce206efe34ba'


Trivial merge