merge of '99919cb8b538ef795301795c0abf7a23fa66d751'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 20:05:58 +0000 (20:05 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 20:05:58 +0000 (20:05 +0000)
     and 'e50520839964c08c9cfd593b957f1efb58c951aa'


Trivial merge