merge of '344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a'      and '90e0a15d1fa7861aebb988530cf5503d63b9b9c0'
merge of '344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a'
     and '90e0a15d1fa7861aebb988530cf5503d63b9b9c0'

Monotone-Parent: 344c60c460c2ec1cb8f2adfd4f4e2af9da772e4a
Monotone-Parent: 90e0a15d1fa7861aebb988530cf5503d63b9b9c0
Monotone-Revision: 00a98c9420d949b7f4dccea479d8d3d83154bdf4

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2012-07-24T18:48:15

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