merge of '08f744da20c99e50446879fca5f5ee8194b2217b'      and '783f97bcf896d7f1f4a68b2bdb211c79e4383241'
merge of '08f744da20c99e50446879fca5f5ee8194b2217b'
     and '783f97bcf896d7f1f4a68b2bdb211c79e4383241'

Monotone-Parent: 08f744da20c99e50446879fca5f5ee8194b2217b
Monotone-Parent: 783f97bcf896d7f1f4a68b2bdb211c79e4383241
Monotone-Revision: c58fc8185274bae5a88c2fc98e49c56fb4e81878

Monotone-Author: 0ad4c322044b9a27f123c8b38ae7897d9caf60a9@inverse.ca
Monotone-Date: 2009-07-29T18:49:21
Monotone-Branch: ca.inverse.sogo

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