merge of '78cb42a882628f677b3ba5d765444a8e6ce3f071'      and 'a185416cfb05a18befc24458bae35ac50a38eb8c'
merge of '78cb42a882628f677b3ba5d765444a8e6ce3f071'
     and 'a185416cfb05a18befc24458bae35ac50a38eb8c'

Monotone-Parent: 78cb42a882628f677b3ba5d765444a8e6ce3f071
Monotone-Parent: a185416cfb05a18befc24458bae35ac50a38eb8c
Monotone-Revision: 673fe4d07a0220bbfe30989c1205e2bd001cabb3

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2011-04-13T19:42:20
Monotone-Branch: ca.inverse.sogo

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