merge of '2315fd857fb9cd19617eedf26be41092290b416f'      and '3014a5bc1171dc1be50b98deb24d4cfc7e769a71'
merge of '2315fd857fb9cd19617eedf26be41092290b416f'
     and '3014a5bc1171dc1be50b98deb24d4cfc7e769a71'

Monotone-Parent: 2315fd857fb9cd19617eedf26be41092290b416f
Monotone-Parent: 3014a5bc1171dc1be50b98deb24d4cfc7e769a71
Monotone-Revision: 1ba4b22d198e6713ef43aa72d57226fbb44656c1

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2007-12-17T22:19:04
Monotone-Branch: ca.inverse.sogo

Distrotech/sogo,Distrotech/sogo,Distrotech/sogo,Distrotech/sogo,Distrotech/sogo