merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
authorMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 21:52:01 +0000 (21:52 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 29 Nov 2007 21:52:01 +0000 (21:52 +0000)
commitae7eb4076905d0b10613ba756acc9924e3d4fbaf
treed696d2ffa10fdc1f78c2639a4f3747b3b8f4bc12
parent67a1d946c02b02f76e70e792d4cfb1b0c5ada84e
parent281e31e88a5958f8d22ade40fd7f1713a470f7c3
Merge ... '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
     and '332e97250454514e2c07aea9f1695ab21166d191'