merge of '7cf3b400cf166b89986056289fa50151e6511f08'
authorHolger Freyther <zecke@selfish.org>
Wed, 15 Nov 2006 00:08:01 +0000 (00:08 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 15 Nov 2006 00:08:01 +0000 (00:08 +0000)
commit99a536b0501b9e5dc4883c3ca8861ef852566218
treed4fe811d385d4903efaa02258c54d70b8aff684b
parent8eeeea5198e888833deafbfaa99724e72f519452
parent11cc6e36d1b600e2cdfe786c352f2e178b1b9d97
Merge ... '7cf3b400cf166b89986056289fa50151e6511f08'
     and 'cbaa08b3cff2b520cf8b1843f19eea0d9539c2f4'