merge of '2cc61994b1fd18611f88fb4a7bd881ef6c12c05c'      and 'bf7b6e86d357e58b2060b9ab18910bae0bbae64c'
merge of '2cc61994b1fd18611f88fb4a7bd881ef6c12c05c'
     and 'bf7b6e86d357e58b2060b9ab18910bae0bbae64c'

Monotone-Parent: 2cc61994b1fd18611f88fb4a7bd881ef6c12c05c
Monotone-Parent: bf7b6e86d357e58b2060b9ab18910bae0bbae64c
Monotone-Revision: 5652b12a99be3b69adbf207347b951ec2e5f6c89

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2008-07-09T11:15:27
Monotone-Branch: ca.inverse.sogo

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