merge of '1f214e14c9d3b425af04e63d10366f79a2483e70'
authorHolger Freyther <zecke@selfish.org>
Sat, 10 Mar 2007 00:30:42 +0000 (00:30 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 10 Mar 2007 00:30:42 +0000 (00:30 +0000)
commite73b534d30fdc40e7084b6f5b58e823266791ea4
treee5c9af85bf5af215c88f778c658e544d5c416e3a
parent122d82f760b75b65cc6ea60ca28fde6c145f5b7d
parent21e7506f34e5cc2fc0667ecab73202422f7225cd
Merge ... '1f214e14c9d3b425af04e63d10366f79a2483e70'
     and '2aeb175474c9351f406f0b35b67310233e32d9cf'