merge of '815204fe1b8d9f62f875d9e22c4883aede5c1e8d'      and 'f84a4aea78f0990248fedd817ec377260a9120b3'
merge of '815204fe1b8d9f62f875d9e22c4883aede5c1e8d'
     and 'f84a4aea78f0990248fedd817ec377260a9120b3'

Monotone-Parent: 815204fe1b8d9f62f875d9e22c4883aede5c1e8d
Monotone-Parent: f84a4aea78f0990248fedd817ec377260a9120b3
Monotone-Revision: 82ff830f32b58a69104d076987745b96e90e0ebf

Monotone-Author: 0d43d962e72edf860b600c0ee51aaa6298409546@inverse.ca
Monotone-Date: 2010-04-03T07:36:15
Monotone-Branch: ca.inverse.sogo

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