merge of '846bde67b99146677600ce9b3ee03f06d8c764c3'
authorMatthias Hentges <oe@hentges.net>
Fri, 23 Mar 2007 18:24:21 +0000 (18:24 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 23 Mar 2007 18:24:21 +0000 (18:24 +0000)
commit0d74d652cb96b9bec6744bf2bb985449b343a30c
tree44091f0d6151053295c67323da7fdb0e478e8f6e
parentc88750093b1ea4da88fc703d9e0677603777cae5
parent4d8969947f20857631fb65fd8d739d2d92efac75
Merge ... '846bde67b99146677600ce9b3ee03f06d8c764c3'
     and 'f0ea8dcdc5d59f269582084a643d55c9333fbc66'