merge of '69a166c7072b74d6a2c00aef7ecebacee3e1706a'
authorHolger Freyther <zecke@selfish.org>
Mon, 21 Jan 2008 11:11:58 +0000 (11:11 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 21 Jan 2008 11:11:58 +0000 (11:11 +0000)
commit1e7cdf063e1166e4d6c2b383801f5e529071c603
treef3d41732eee82b846e0c94edb19fde5faf0c0496
parent3074e69fa414fe2745798492fd7a6e76ff37fe84
parent9a39065a3235418bf94dde6e4f8a418472068717
Merge ... '69a166c7072b74d6a2c00aef7ecebacee3e1706a'
     and '8b72081ac43d603c1378f0c3e6589903e1fe2231'