merge of '27325903c7c22f4bf624c26770a8d5506aa2ef70'      and 'fbf33893aadacadd740bd14f543861a0c8f9aee5'
merge of '27325903c7c22f4bf624c26770a8d5506aa2ef70'
     and 'fbf33893aadacadd740bd14f543861a0c8f9aee5'

Monotone-Parent: 27325903c7c22f4bf624c26770a8d5506aa2ef70
Monotone-Parent: fbf33893aadacadd740bd14f543861a0c8f9aee5
Monotone-Revision: 1334b0291ad757f98c96b8cb3b8c8adf02c08bad

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2010-02-19T20:02:19
Monotone-Branch: ca.inverse.sogo

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