merge of '00c385f170e269a8305d89f7f557f6ee66aa5904'      and 'b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f'
merge of '00c385f170e269a8305d89f7f557f6ee66aa5904'
     and 'b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f'

Monotone-Parent: 00c385f170e269a8305d89f7f557f6ee66aa5904
Monotone-Parent: b87371b5b686da6d0d84e233c3ffbd8f8f9fbe1f
Monotone-Revision: 7e03e68f3bd26f03d5835176e1850405de4fe8b5

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2010-10-18T18:30:43
Monotone-Branch: ca.inverse.sogo

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