merge of '005491f350146d41b598e61470a349d6466dbd0d'
authorHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 22:22:18 +0000 (22:22 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 22:22:18 +0000 (22:22 +0000)
     and '906d58269912b71d4b883f2167935ffe376e85e8'


Trivial merge