merge of 'a5370a41693bc2294eb25921c8e19dda7570a063'      and 'e0936e909247455078da70476a50abb9a47ecd91'
merge of 'a5370a41693bc2294eb25921c8e19dda7570a063'
     and 'e0936e909247455078da70476a50abb9a47ecd91'

Monotone-Parent: a5370a41693bc2294eb25921c8e19dda7570a063
Monotone-Parent: e0936e909247455078da70476a50abb9a47ecd91
Monotone-Revision: 875a3fc15e011173c22d5a90e998d65087950ddc

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2007-07-12T14:35:38
Monotone-Branch: ca.inverse.sogo

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