merge of '4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0'      and 'a1c1eacbf93b1c77a04e617675b261da87d45947'
merge of '4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0'
     and 'a1c1eacbf93b1c77a04e617675b261da87d45947'

Monotone-Parent: 4b1cae6ed7b8c58f9cf2e2df5162ad6ed6ea12c0
Monotone-Parent: a1c1eacbf93b1c77a04e617675b261da87d45947
Monotone-Revision: 80545770d33420a47df77acb284ef0203c16cd94

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

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