merge of '649a1187cf216e088818ea020c5b497e84dd0fa4'
and 'c0371b2cf247262cea5e1c8f66d234a0da8d2a51' Monotone-Parent: 649a1187cf216e088818ea020c5b497e84dd0fa4 Monotone-Parent: c0371b2cf247262cea5e1c8f66d234a0da8d2a51 Monotone-Revision: b23bdab0a580470a6bfc7c0c9434bf9cf10b3df9 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-08-28T15:07:27 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
c96a047534