merge of 'a91fdc0311ce32c507f4f0c447904b80ca61e876'      and 'd378eb61291cd07a2168a877719d71f7f92f3a38'
merge of 'a91fdc0311ce32c507f4f0c447904b80ca61e876'
     and 'd378eb61291cd07a2168a877719d71f7f92f3a38'

Monotone-Parent: a91fdc0311ce32c507f4f0c447904b80ca61e876
Monotone-Parent: d378eb61291cd07a2168a877719d71f7f92f3a38
Monotone-Revision: e8f4e2f61f45b6dd1478f6cd53e4f2528bf7c047

Monotone-Author: 0ad4c322044b9a27f123c8b38ae7897d9caf60a9@inverse.ca
Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2008-09-29T19:45:42
Monotone-Date: 2008-09-29T20:45:53
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo

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