merge of '9bd966b224328d78fb14df7e0b5cca2b4e4e4bfb'      and 'f14ae03d576d6870939b367861ecc7f56c411580'
merge of '9bd966b224328d78fb14df7e0b5cca2b4e4e4bfb'
     and 'f14ae03d576d6870939b367861ecc7f56c411580'

Monotone-Parent: 9bd966b224328d78fb14df7e0b5cca2b4e4e4bfb
Monotone-Parent: f14ae03d576d6870939b367861ecc7f56c411580
Monotone-Revision: 2c333cbb2be8ee61b03f3ba7f4e2a293be78f431

Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2010-03-15T17:56:35
Monotone-Branch: ca.inverse.sogo

Distrotech/sogo,Distrotech/sogo,Distrotech/sogo,Distrotech/sogo,Distrotech/sogo