merge of '7a60f4a9ba785405e4cc33bb708c1870090f6691'

and 'c9c5d4c2459dece2bf7417926d244b1088f86576'

Monotone-Parent: 7a60f4a9ba785405e4cc33bb708c1870090f6691
Monotone-Parent: c9c5d4c2459dece2bf7417926d244b1088f86576
Monotone-Revision: 2073217aff674fdde9b98866ce5d367033d6a51e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-09-05T15:12:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2008-09-05 15:12:44 +00:00

Diff Content Not Available