merge of '9fa7d7e59941b8d15fcc1dc722bd3d781d3a4407'
authorHolger Freyther <zecke@selfish.org>
Tue, 12 Sep 2006 07:57:45 +0000 (07:57 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 12 Sep 2006 07:57:45 +0000 (07:57 +0000)
     and 'dbb377d00572c21544539346dc158feea2cfd1d6'


Trivial merge