merge of '89cd2556ac06a9a9dd5fe232a734dec9569772da'
authorHolger Freyther <zecke@selfish.org>
Sun, 18 Feb 2007 16:03:42 +0000 (16:03 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 18 Feb 2007 16:03:42 +0000 (16:03 +0000)
commitb4d163b526e513f0401ac94f9358c20988082451
treee938f9fe945af6ff796237dd384c3726cc804722
parent06bd533ed1a1dbe243d97401a810d264a1561b98
parent986c1887923b2c61a0056ef82ce3d46399f8dfc4
Merge ... '89cd2556ac06a9a9dd5fe232a734dec9569772da'
     and 'c416a7368aa98390e48b2c8eed6650147874a490'