merge of '50e65cc6ce54ea052b3aeba048f1a2f447154953'      and '5ded584da8e206ac5d953762545e4d49aa5010d7'
merge of '50e65cc6ce54ea052b3aeba048f1a2f447154953'
     and '5ded584da8e206ac5d953762545e4d49aa5010d7'

Monotone-Parent: 50e65cc6ce54ea052b3aeba048f1a2f447154953
Monotone-Parent: 5ded584da8e206ac5d953762545e4d49aa5010d7
Monotone-Revision: 79274fbc0dcc605237ea83312be3e900b8e97903

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2010-09-29T13:28:47
Monotone-Branch: ca.inverse.sogo

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