merge of '084b301b3063c88fe114f956424ce200979b1c31'
authorHolger Freyther <zecke@selfish.org>
Fri, 16 Mar 2007 21:08:07 +0000 (21:08 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 16 Mar 2007 21:08:07 +0000 (21:08 +0000)
commite3993ed56c6b1b46c1726a40a48b46f9523b4a10
treecc2b4f7e91ee82a9f04cf8c085f7520133921035
parent1977f9a109dac503efc20651adde01c28a92fd4f
parent9a627b9161ebdbcef11fdfe1a2a3c667b653e777
Merge ... '084b301b3063c88fe114f956424ce200979b1c31'
     and '48c496f011147db1b9af6d381745616b2a2472e6'