merge of '526a073fc87c09567076f347f0e042c0aa8a264a'
authorHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 13:53:32 +0000 (13:53 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 13:53:32 +0000 (13:53 +0000)
     and 'd9d274079b360d07c0675fde77410b26827a2295'


Trivial merge