merge of '117181687b89cc111fa7c80b6e0a5fb5d9e8a5af'      and '38c27767c4a6419b76e05bfc2eefc158b009bf28'
merge of '117181687b89cc111fa7c80b6e0a5fb5d9e8a5af'
     and '38c27767c4a6419b76e05bfc2eefc158b009bf28'

Monotone-Parent: 117181687b89cc111fa7c80b6e0a5fb5d9e8a5af
Monotone-Parent: 38c27767c4a6419b76e05bfc2eefc158b009bf28
Monotone-Revision: 55136d300cf8d13c53cb1e7978c4915fba81f463

Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2008-09-05T18:00:24
Monotone-Branch: ca.inverse.sogo

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