merge of 'a1c1eacbf93b1c77a04e617675b261da87d45947'      and 'b5081e44c9a03ab4fd5987c45fd8bf518f9c773f'
merge of 'a1c1eacbf93b1c77a04e617675b261da87d45947'
     and 'b5081e44c9a03ab4fd5987c45fd8bf518f9c773f'

Monotone-Parent: a1c1eacbf93b1c77a04e617675b261da87d45947
Monotone-Parent: b5081e44c9a03ab4fd5987c45fd8bf518f9c773f
Monotone-Revision: 4996dd3cf01c2faa951ae04e44de3eb31194a326

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2008-08-25T20:54:06
Monotone-Branch: ca.inverse.sogo

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