merge of '34eb92128b8ce40ea590eedcbe2b203f173bb8f9'
and '350058ff37111e646407d97db552b5f4c9e96f90' Monotone-Parent: 34eb92128b8ce40ea590eedcbe2b203f173bb8f9 Monotone-Parent: 350058ff37111e646407d97db552b5f4c9e96f90 Monotone-Revision: 1360315b4068f2b44ac3bf8d5c6a78084349c0bb Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-09-03T19:29:16 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
76b90c0eee