merge of 'b9a09b9bf8fc46e61ede310c9787e2c7118175cd'      and 'ba544c4d9dc8a0764eb65feb6e8655bacf2701c5'
merge of 'b9a09b9bf8fc46e61ede310c9787e2c7118175cd'
     and 'ba544c4d9dc8a0764eb65feb6e8655bacf2701c5'

Monotone-Parent: b9a09b9bf8fc46e61ede310c9787e2c7118175cd
Monotone-Parent: ba544c4d9dc8a0764eb65feb6e8655bacf2701c5
Monotone-Revision: 85562e3494ccd15c1f10a3a0bbdfeb11ff54430d

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2010-09-02T16:38:07
Monotone-Branch: ca.inverse.sogo

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