merge of '63d885278525c121ba22e743c666e34900d9cf2b'      and '764dc2a57b1679736fee67beb1479636c8a1b54b'
merge of '63d885278525c121ba22e743c666e34900d9cf2b'
     and '764dc2a57b1679736fee67beb1479636c8a1b54b'

Monotone-Parent: 63d885278525c121ba22e743c666e34900d9cf2b
Monotone-Parent: 764dc2a57b1679736fee67beb1479636c8a1b54b
Monotone-Revision: d68ff2564716354de100688f82825ac0b5a5f2e9

Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2010-07-16T11:50:23
Monotone-Branch: ca.inverse.sogo

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