merge of 'a2cbb882585652aa32a8a34aa0b1e4c61649ce04'      and 'a74245035e03f9c4d879846e3b90f3d7f0c64657'
merge of 'a2cbb882585652aa32a8a34aa0b1e4c61649ce04'
     and 'a74245035e03f9c4d879846e3b90f3d7f0c64657'

Monotone-Parent: a2cbb882585652aa32a8a34aa0b1e4c61649ce04
Monotone-Parent: a74245035e03f9c4d879846e3b90f3d7f0c64657
Monotone-Revision: 4e15640eabc9053b15d1d41557d0a3d2e9ddd1ec

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2009-10-30T14:42:32
Monotone-Branch: ca.inverse.sogo

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