merge of '2052b9dc077ae7af1e3a8d4929d79cfd202de6ad'      and 'd3ebcb6db8dee3d858871a8ba7d7566e5ffd5f3e'
merge of '2052b9dc077ae7af1e3a8d4929d79cfd202de6ad'
     and 'd3ebcb6db8dee3d858871a8ba7d7566e5ffd5f3e'

Monotone-Parent: 2052b9dc077ae7af1e3a8d4929d79cfd202de6ad
Monotone-Parent: d3ebcb6db8dee3d858871a8ba7d7566e5ffd5f3e
Monotone-Revision: 5921568bee00f491f2b94ec6398344393f1b38aa

Monotone-Author: 146473bcb6ff4a8b8b564d04e59c99d8296501cb@Sophos.ca
Monotone-Date: 2009-07-21T10:53:03
Monotone-Branch: ca.inverse.sogo

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