merge of '1acff2251868501e5baba3465e49475362ce1e4b'      and '68057140404e926c49422f77445d1b382fc182e5'
merge of '1acff2251868501e5baba3465e49475362ce1e4b'
     and '68057140404e926c49422f77445d1b382fc182e5'

Monotone-Parent: 1acff2251868501e5baba3465e49475362ce1e4b
Monotone-Parent: 68057140404e926c49422f77445d1b382fc182e5
Monotone-Revision: 434c3721a8dac924cce0531eebee09d9b27457ea

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2010-09-20T14:29:04
Monotone-Branch: ca.inverse.sogo

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