merge of '11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052'      and 'd999a58fea7c083b81da56a7f2274d857b44eb7a'
merge of '11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052'
     and 'd999a58fea7c083b81da56a7f2274d857b44eb7a'

Monotone-Parent: 11ca52315bdce5c8e4b000e5b9f33d5b2ecbd052
Monotone-Parent: d999a58fea7c083b81da56a7f2274d857b44eb7a
Monotone-Revision: 1e1b1ea27969183ec35f1d755b26adeadb3874c0

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2009-09-23T17:18:32
Monotone-Branch: ca.inverse.sogo

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