merge of '1f214e14c9d3b425af04e63d10366f79a2483e70'
authorHolger Freyther <zecke@selfish.org>
Sat, 10 Mar 2007 00:30:42 +0000 (00:30 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 10 Mar 2007 00:30:42 +0000 (00:30 +0000)
     and '2aeb175474c9351f406f0b35b67310233e32d9cf'


Trivial merge