merge of '6810c56ec0938b566b7b3956334cdf42acad581b'
and 'faae591447bb2bc51c88baef80263d6f3c92e155' Monotone-Parent: 6810c56ec0938b566b7b3956334cdf42acad581b Monotone-Parent: faae591447bb2bc51c88baef80263d6f3c92e155 Monotone-Revision: 85f1f53db7cb67b3254c177bab77b5c13ab8a76f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-02T21:04:10 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
ccaa70b407