merge of '464a36a4cf8b5363c773454107f99d458238f9ad'      and '7a6e1fe27ab30ac91e4bde131ecca9500f2ddb87'
merge of '464a36a4cf8b5363c773454107f99d458238f9ad'
     and '7a6e1fe27ab30ac91e4bde131ecca9500f2ddb87'

Monotone-Parent: 464a36a4cf8b5363c773454107f99d458238f9ad
Monotone-Parent: 7a6e1fe27ab30ac91e4bde131ecca9500f2ddb87
Monotone-Revision: 245edd2f1c6f124d2608cb323b7bf7660bb7583f

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2009-07-23T17:43:31
Monotone-Branch: ca.inverse.sogo

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