merge of '623ea3aff033ebbbbf8a8a9524a46a58768afed1'
authorHolger Freyther <zecke@selfish.org>
Fri, 19 Jan 2007 13:30:40 +0000 (13:30 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 19 Jan 2007 13:30:40 +0000 (13:30 +0000)
commitb47d08b7fedb47ce179194c8b32dbe218579fbbf
tree66a6bf3bf72715e4e63892453fe74a37f04b9f85
parentdd39d799f0deb4c3862d94930cf55289ca1690a5
parent16755da8ff4ab629653899cb2b17e4ab7d10e812
Merge ... '623ea3aff033ebbbbf8a8a9524a46a58768afed1'
     and 'a883397cbf4a34b6feb952e04840485ff88c15cd'