merge of '57ab60b3a3a179042115ec92eeabf44470945a9c'      and '7822887b219614cd66e9d1e19da4799f884657bf'
merge of '57ab60b3a3a179042115ec92eeabf44470945a9c'
     and '7822887b219614cd66e9d1e19da4799f884657bf'

Monotone-Parent: 57ab60b3a3a179042115ec92eeabf44470945a9c
Monotone-Parent: 7822887b219614cd66e9d1e19da4799f884657bf
Monotone-Revision: 0ed0ef307cb74b67ba17424e0e8a0e04a8364e9f

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2007-10-18T17:20:18
Monotone-Branch: ca.inverse.sogo

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