merge of '39030d97b266cc74d362571046ff686f9fa4b71c'
authorHolger Freyther <zecke@selfish.org>
Wed, 7 Mar 2007 00:43:45 +0000 (00:43 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 7 Mar 2007 00:43:45 +0000 (00:43 +0000)
     and 'efc288dfca6db8af7c6c350c1661838d4c1433c8'


Trivial merge