merge of 'af0f25bad53ac40966623922f300d0010d5bddcd'
authorHolger Freyther <zecke@selfish.org>
Sun, 6 Aug 2006 13:24:40 +0000 (13:24 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 6 Aug 2006 13:24:40 +0000 (13:24 +0000)
     and 'e01159849c30197f5d81415a84ca779aa90ee704'


Trivial merge