merge of 'c6255287239acf53aaad227885cb7b5e32ab68af'      and 'e582b1fdc5748b1cb3f1cf14d9019773a5ffa746'
merge of 'c6255287239acf53aaad227885cb7b5e32ab68af'
     and 'e582b1fdc5748b1cb3f1cf14d9019773a5ffa746'

Monotone-Parent: c6255287239acf53aaad227885cb7b5e32ab68af
Monotone-Parent: e582b1fdc5748b1cb3f1cf14d9019773a5ffa746
Monotone-Revision: abba53838baf14abe32e7df33d5c776a643f81fe

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2007-05-16T16:04:15
Monotone-Branch: ca.inverse.sogo

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