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)
commit2fdcfd98504544d0cb1773862acba9a2164e72b9
treecaf9206f14425768d124e6c58dbbba9dc082e1d4
parent99392e1c17c790e5a76e2e0d2094721b0a080715
parent7ed76d54a2105ee7df762c267ba60497f15c1a69
Merge ... '9fa7d7e59941b8d15fcc1dc722bd3d781d3a4407'
     and 'dbb377d00572c21544539346dc158feea2cfd1d6'