merge of 'cedb7ff755d548fba20667453e2f57687b9f0c69'      and 'd9c6f196efed8f1e880b51537ffdc6f0cfd54fe5'
merge of 'cedb7ff755d548fba20667453e2f57687b9f0c69'
     and 'd9c6f196efed8f1e880b51537ffdc6f0cfd54fe5'

Monotone-Parent: cedb7ff755d548fba20667453e2f57687b9f0c69
Monotone-Parent: d9c6f196efed8f1e880b51537ffdc6f0cfd54fe5
Monotone-Revision: 3010ebbe1277877fbfa6abfb4321d877aab63b77

Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2009-01-20T19:24:28
Monotone-Branch: ca.inverse.sogo

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