merge of '17499446a7bcff456b8470a83c44e2d4b341cc21'      and '8f98146395a5826ccfe93f7881144f6813f07068'
merge of '17499446a7bcff456b8470a83c44e2d4b341cc21'
     and '8f98146395a5826ccfe93f7881144f6813f07068'

Monotone-Parent: 17499446a7bcff456b8470a83c44e2d4b341cc21
Monotone-Parent: 8f98146395a5826ccfe93f7881144f6813f07068
Monotone-Revision: 91104e04b3ba763294cc8bad97370133142eee86

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2011-11-24T07:45:44

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