merge of '47c3ff1522958a2650c7b2b3d9d4407ed0d21510'
and '6c2ef11e5e4b49c1d4625ae51b0c61645dfeaed5' Monotone-Parent: 47c3ff1522958a2650c7b2b3d9d4407ed0d21510 Monotone-Parent: 6c2ef11e5e4b49c1d4625ae51b0c61645dfeaed5 Monotone-Revision: 0cce1c8355516f6fd78c9fc7bebd2d918235f6dd Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2008-08-26T10:55:00 Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
2c7b0ea817