merge of '9dc1c127f410eb6a2bcfa8e50929a9ab77e8c255'      and 'cff34552be80b43b382bf21a61aea5efb44ca8ab'
merge of '9dc1c127f410eb6a2bcfa8e50929a9ab77e8c255'
     and 'cff34552be80b43b382bf21a61aea5efb44ca8ab'

Monotone-Parent: 9dc1c127f410eb6a2bcfa8e50929a9ab77e8c255
Monotone-Parent: cff34552be80b43b382bf21a61aea5efb44ca8ab
Monotone-Revision: 39df276f7e7e9a64d5949f3075f98a71e913491d

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2009-06-08T20:26:27
Monotone-Branch: ca.inverse.sogo

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