merge of 'a78e1d7bc5249205bb5472f1376465ca1d88e281'

and 'd205cf705c1c42fd1d48092e23c41087cdfce10a'

Monotone-Parent: a78e1d7bc5249205bb5472f1376465ca1d88e281
Monotone-Parent: d205cf705c1c42fd1d48092e23c41087cdfce10a
Monotone-Revision: 5445a1fde58efa8862fc96a605c39020c9ff0dfb

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-07T19:18:58
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-07-07 19:18:58 +00:00
Binary file not shown.