merge of 'af0f25bad53ac40966623922f300d0010d5bddcd'
authorHolger Freyther <zecke@selfish.org>
Sun, 6 Aug 2006 13:24:40 +0000 (13:24 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 6 Aug 2006 13:24:40 +0000 (13:24 +0000)
commit6608794e72068692b56d77db9b157df28eb691bb
tree8aa0b9cc40ec611f6369df05b6ce8e29be476cdb
parent27900a482bcdafd387ed455e747fac95f8a74177
parentaea3bc79a39d0a3b4589f73c7907dd6d7b62b811
Merge ... 'af0f25bad53ac40966623922f300d0010d5bddcd'
     and 'e01159849c30197f5d81415a84ca779aa90ee704'