merge of '61e9cb8576de573c854c03bbed61f9f0833b714a'      and '9cdec2953442f16223c2835dd7f7487efbc08e64'
merge of '61e9cb8576de573c854c03bbed61f9f0833b714a'
     and '9cdec2953442f16223c2835dd7f7487efbc08e64'

Monotone-Parent: 61e9cb8576de573c854c03bbed61f9f0833b714a
Monotone-Parent: 9cdec2953442f16223c2835dd7f7487efbc08e64
Monotone-Revision: 9ca40f8edea449c724ab6a94b878dd7987baa893

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2009-01-30T18:41:46
Monotone-Branch: ca.inverse.sogo

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