merge of '054094f9b080f4f9f4cda29e0be81cf14681bb8e'

and '5a3756ce927fd4f5ebc0d146f6dd71d1c08f81b9'

Monotone-Parent: 054094f9b080f4f9f4cda29e0be81cf14681bb8e
Monotone-Parent: 5a3756ce927fd4f5ebc0d146f6dd71d1c08f81b9
Monotone-Revision: 78183d1c12a5cd7f7980683cdf75c55d9cc453c6

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-09-05T13:26:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2008-09-05 13:26:55 +00:00
commit 85c50693ab

Diff content is not available