merge of '2f0d42cca69230479f5caefd8f858f7923b64337'

and 'b23bdab0a580470a6bfc7c0c9434bf9cf10b3df9'

Monotone-Parent: 2f0d42cca69230479f5caefd8f858f7923b64337
Monotone-Parent: b23bdab0a580470a6bfc7c0c9434bf9cf10b3df9
Monotone-Revision: 41dc6a577f2466142d95218b1e0d9d242689638b

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-08-28T20:39:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2008-08-28 20:39:45 +00:00

Diff Content Not Available