merge of '178cf4e5311729ac333305676b5ad2aa35a7ca71'      and 'da943d19b66326d6a44506dad61363238c96ca37'
merge of '178cf4e5311729ac333305676b5ad2aa35a7ca71'
     and 'da943d19b66326d6a44506dad61363238c96ca37'

Monotone-Parent: 178cf4e5311729ac333305676b5ad2aa35a7ca71
Monotone-Parent: da943d19b66326d6a44506dad61363238c96ca37
Monotone-Revision: da71a89c98fc467cc01710a03c0654176bc8b0fe

Monotone-Author: 387a0c2ba59e1bc0a6652f3d9a07ca93aec26bac@inverse.ca
Monotone-Date: 2011-06-27T22:44:21
Monotone-Branch: ca.inverse.sogo

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