merge of '965e5b9c7ec2a2d90948e6cd8a6cb2b4dd7b6159'

and 'c9ec5e37f4a0b75a5c85ecbbd8d238cc64a99cd3'

Monotone-Parent: 965e5b9c7ec2a2d90948e6cd8a6cb2b4dd7b6159
Monotone-Parent: c9ec5e37f4a0b75a5c85ecbbd8d238cc64a99cd3
Monotone-Revision: 2c4d3e7457a36602400b6dd3bfb34b34fa47e606

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-02-15T18:42:47
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2011-02-15 18:42:47 +00:00
commit 2d3b7d8bd0