merge of 'c1fde6184b467d9973431aa6c2c19a550609483b'      and 'f42fa8175185006d18851f3f65a8b51106ec4756'
merge of 'c1fde6184b467d9973431aa6c2c19a550609483b'
     and 'f42fa8175185006d18851f3f65a8b51106ec4756'

Monotone-Parent: c1fde6184b467d9973431aa6c2c19a550609483b
Monotone-Parent: f42fa8175185006d18851f3f65a8b51106ec4756
Monotone-Revision: 11f90d05631a863d591c668b5d433e7735381723

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2007-06-07T16:28:27
Monotone-Branch: ca.inverse.sogo

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