merge of '9003f157ebcad8369e5e69e70dc966267d1cf728'      and 'db370b54d1c04790d487307a6c2427a914aae37b'
merge of '9003f157ebcad8369e5e69e70dc966267d1cf728'
     and 'db370b54d1c04790d487307a6c2427a914aae37b'

Monotone-Parent: 9003f157ebcad8369e5e69e70dc966267d1cf728
Monotone-Parent: db370b54d1c04790d487307a6c2427a914aae37b
Monotone-Revision: 0fae105daa23d0bfd278a2c1253b578984b8876e

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2009-12-09T21:46:39
Monotone-Branch: ca.inverse.sogo

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