merge of '0def0e9f316e25be6056fa81895ad9297459eaca'      and 'c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe'
merge of '0def0e9f316e25be6056fa81895ad9297459eaca'
     and 'c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe'

Monotone-Parent: 0def0e9f316e25be6056fa81895ad9297459eaca
Monotone-Parent: c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe
Monotone-Revision: df5dd81d62db331ba5c8de9f2257f9430c586534

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2012-01-06T14:36:47
Monotone-Branch: ca.inverse.sogo

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