merge of 'ae19f5b80b87d9f63b4068d2a027a9fdb3190efb'      and 'c5a2fc082a5c244225c25cf41b83bbc018f79a6d'
merge of 'ae19f5b80b87d9f63b4068d2a027a9fdb3190efb'
     and 'c5a2fc082a5c244225c25cf41b83bbc018f79a6d'

Monotone-Parent: ae19f5b80b87d9f63b4068d2a027a9fdb3190efb
Monotone-Parent: c5a2fc082a5c244225c25cf41b83bbc018f79a6d
Monotone-Revision: 6c373f0d20463d992f29e12a75b931b08f890301

Monotone-Author: 0ad4c322044b9a27f123c8b38ae7897d9caf60a9@inverse.ca
Monotone-Date: 2008-10-09T19:59:45
Monotone-Branch: ca.inverse.sogo

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