merge of '48fff7af102a6b39298ffbb7c4da0976ee074625'      and '5bcb309e0f6b76e9e7affc6ec688d4cbd7b5bef4'
merge of '48fff7af102a6b39298ffbb7c4da0976ee074625'
     and '5bcb309e0f6b76e9e7affc6ec688d4cbd7b5bef4'

Monotone-Parent: 48fff7af102a6b39298ffbb7c4da0976ee074625
Monotone-Parent: 5bcb309e0f6b76e9e7affc6ec688d4cbd7b5bef4
Monotone-Revision: 9b0e70cef01c0afdbc1684211507c86871122671

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2011-04-26T17:51:36
Monotone-Branch: ca.inverse.sogo

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