merge of '27ff1857cc937c28d83c101f077e83c119249cd6'      and 'f83500f2eb31440f37507e6dd73a3a5932b74c3d'
merge of '27ff1857cc937c28d83c101f077e83c119249cd6'
     and 'f83500f2eb31440f37507e6dd73a3a5932b74c3d'

Monotone-Parent: 27ff1857cc937c28d83c101f077e83c119249cd6
Monotone-Parent: f83500f2eb31440f37507e6dd73a3a5932b74c3d
Monotone-Revision: f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36

Monotone-Author: 0ad4c322044b9a27f123c8b38ae7897d9caf60a9@inverse.ca
Monotone-Date: 2009-06-30T14:52:45
Monotone-Branch: ca.inverse.sogo

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