merge of '2c09693bb8c946283a7305ff62458c9930fc8a9c'      and 'c1c73961c8d9bbf5383d28788200bf3cbbac4e55'
merge of '2c09693bb8c946283a7305ff62458c9930fc8a9c'
     and 'c1c73961c8d9bbf5383d28788200bf3cbbac4e55'

Monotone-Parent: 2c09693bb8c946283a7305ff62458c9930fc8a9c
Monotone-Parent: c1c73961c8d9bbf5383d28788200bf3cbbac4e55
Monotone-Revision: 6f81ff5c61f2abaad8d6b69b657abb61e52df9b9

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2011-04-19T19:06:53
Monotone-Branch: ca.inverse.sogo

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