merge of '39a02584d6f552b43a783fc48bc54d99f63c12d0'      and 'b5081e44c9a03ab4fd5987c45fd8bf518f9c773f'
merge of '39a02584d6f552b43a783fc48bc54d99f63c12d0'
     and 'b5081e44c9a03ab4fd5987c45fd8bf518f9c773f'

Monotone-Parent: 39a02584d6f552b43a783fc48bc54d99f63c12d0
Monotone-Parent: b5081e44c9a03ab4fd5987c45fd8bf518f9c773f
Monotone-Revision: 4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0

Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2008-08-25T19:18:29
Monotone-Branch: ca.inverse.sogo

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