merge of '75e3cd2469a9c4627a182aa0bef3750b8d65a99e'
and 'c94dcb16868ca60cb633c8c91ff225e1f3b84329' Monotone-Parent: 75e3cd2469a9c4627a182aa0bef3750b8d65a99e Monotone-Parent: c94dcb16868ca60cb633c8c91ff225e1f3b84329 Monotone-Revision: bb83e15abbaa6a9134aefc67b7bb671c74735ea4 Monotone-Author: flachapelle@inverse.ca Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-03-19T02:15:38 Monotone-Date: 2009-03-19T02:38:55 Monotone-Branch: ca.inverse.sogo Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
ceecaa6563