merge of '5f0840d886de3702b9da184050476e21ca104094'
authorHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 07:35:57 +0000 (07:35 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 07:35:57 +0000 (07:35 +0000)
commitd127e89cd5d287101317289f1f24a1a95589d7e4
treebeca9bbced49b7bc01396fbaa55724144cae13d9
parentd6aa69cc80b27e63f4f77420532b4ed83af7c2a3
parent77b4afc360d84af02638eeb39ff2c2e31eed2fc0
Merge ... '5f0840d886de3702b9da184050476e21ca104094'
     and 'ec78a24debd2c3f06ca663b06355fc91c2bd291f'