merge of '4d5fa5d41e23e83fdb8250dd90fc965723ec9b29'      and 'd2bae4e2dc4bfb2a6101a5dcd5cfd0eb00fdd4b1'
merge of '4d5fa5d41e23e83fdb8250dd90fc965723ec9b29'
     and 'd2bae4e2dc4bfb2a6101a5dcd5cfd0eb00fdd4b1'

Monotone-Parent: 4d5fa5d41e23e83fdb8250dd90fc965723ec9b29
Monotone-Parent: d2bae4e2dc4bfb2a6101a5dcd5cfd0eb00fdd4b1
Monotone-Revision: 36cb10929353af178a9112e3d9f13378f7a8a70f

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2007-11-27T23:18:47
Monotone-Branch: ca.inverse.sogo

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