merge of '2fb05a09608f9836ad74855b6a11b662b983d5a0'      and 'a2dcd47a4089e8f71eebc363e436ba2ed8bc6df5'
merge of '2fb05a09608f9836ad74855b6a11b662b983d5a0'
     and 'a2dcd47a4089e8f71eebc363e436ba2ed8bc6df5'

Monotone-Parent: 2fb05a09608f9836ad74855b6a11b662b983d5a0
Monotone-Parent: a2dcd47a4089e8f71eebc363e436ba2ed8bc6df5
Monotone-Revision: 18f239a3de0b7ac267996e840fa462638dadaf29

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2007-12-10T21:16:44
Monotone-Branch: ca.inverse.sogo

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