merge of '5f0840d886de3702b9da184050476e21ca104094'
authorHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 07:35:57 +0000 (07:35 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 07:35:57 +0000 (07:35 +0000)
     and 'ec78a24debd2c3f06ca663b06355fc91c2bd291f'


Trivial merge