merge of '7cf3b400cf166b89986056289fa50151e6511f08'
authorHolger Freyther <zecke@selfish.org>
Wed, 15 Nov 2006 00:08:01 +0000 (00:08 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 15 Nov 2006 00:08:01 +0000 (00:08 +0000)
     and 'cbaa08b3cff2b520cf8b1843f19eea0d9539c2f4'


Trivial merge