merge of '84411b8b6fbff010342ea44749d83a4f521e3ad7'      and 'ed796ed4ba5a6027433e3f18b4431d54833aeef8'
merge of '84411b8b6fbff010342ea44749d83a4f521e3ad7'
     and 'ed796ed4ba5a6027433e3f18b4431d54833aeef8'

Monotone-Parent: 84411b8b6fbff010342ea44749d83a4f521e3ad7
Monotone-Parent: ed796ed4ba5a6027433e3f18b4431d54833aeef8
Monotone-Revision: 461db977780298f484dd530f71ae963e7dde1fc4

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2009-03-22T15:00:41
Monotone-Branch: ca.inverse.sogo

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