merge of 'a1294497e9f6ed0ee90d2f695f0735f2eb1ced11'      and 'a90e12f6968fb98c4da6b0054a945da493c88d0d'
merge of 'a1294497e9f6ed0ee90d2f695f0735f2eb1ced11'
     and 'a90e12f6968fb98c4da6b0054a945da493c88d0d'

Monotone-Parent: a1294497e9f6ed0ee90d2f695f0735f2eb1ced11
Monotone-Parent: a90e12f6968fb98c4da6b0054a945da493c88d0d
Monotone-Revision: 3628a0085e52c1990e5edce1cb09d581bc96f966

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2008-08-10T21:45:22
Monotone-Branch: ca.inverse.sogo

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