merge of '2b06dc463d88e9e0940158ceccab067e7cc497f7'

and '78183d1c12a5cd7f7980683cdf75c55d9cc453c6'

Monotone-Parent: 2b06dc463d88e9e0940158ceccab067e7cc497f7
Monotone-Parent: 78183d1c12a5cd7f7980683cdf75c55d9cc453c6
Monotone-Revision: 465796f786a1b25ed73a3ba4064f4a51bf6f3a62

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

Diff Content Not Available