merge of '45249fe68411e1b5ecd968fb87f91801d6882115'      and '6c3ab3f69b066603f5ac7caffee043e67c1ab883'
merge of '45249fe68411e1b5ecd968fb87f91801d6882115'
     and '6c3ab3f69b066603f5ac7caffee043e67c1ab883'

Monotone-Parent: 45249fe68411e1b5ecd968fb87f91801d6882115
Monotone-Parent: 6c3ab3f69b066603f5ac7caffee043e67c1ab883
Monotone-Revision: dc6ca87d2eb61c99218dd74023fe0f2bd84434ac

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2010-01-21T22:19:49
Monotone-Branch: ca.inverse.sogo

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