merge of '356577bd6ef977cadd9399a0edb30ba742cbb425'      and 'ee14e86957da3fdf5320b2589b9d5fb65407d353'
merge of '356577bd6ef977cadd9399a0edb30ba742cbb425'
     and 'ee14e86957da3fdf5320b2589b9d5fb65407d353'

Monotone-Parent: 356577bd6ef977cadd9399a0edb30ba742cbb425
Monotone-Parent: ee14e86957da3fdf5320b2589b9d5fb65407d353
Monotone-Revision: cc8f3eae095d7b17561debda2b36946509f78018

Monotone-Author: 0ad4c322044b9a27f123c8b38ae7897d9caf60a9@inverse.ca
Monotone-Date: 2009-06-04T18:50:47
Monotone-Branch: ca.inverse.sogo

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