merge of '05e312bc2aff1f30bb0ce98944cb16c89ee15b86'      and 'f45b91e2758389e5bc0a94b6e80d20778a589e74'
merge of '05e312bc2aff1f30bb0ce98944cb16c89ee15b86'
     and 'f45b91e2758389e5bc0a94b6e80d20778a589e74'

Monotone-Parent: 05e312bc2aff1f30bb0ce98944cb16c89ee15b86
Monotone-Parent: f45b91e2758389e5bc0a94b6e80d20778a589e74
Monotone-Revision: 0ae9c70b160be4f5810d82d165885e7c2612bae3

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2010-10-27T14:20:22
Monotone-Branch: ca.inverse.sogo

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