merge of '894fc668494f3ff87fbd4e784b35d68564b8d482'      and 'f6a2b7a59b97cc24c9e22e0a5b0e131bdcf23204'
merge of '894fc668494f3ff87fbd4e784b35d68564b8d482'
     and 'f6a2b7a59b97cc24c9e22e0a5b0e131bdcf23204'

Monotone-Parent: 894fc668494f3ff87fbd4e784b35d68564b8d482
Monotone-Parent: f6a2b7a59b97cc24c9e22e0a5b0e131bdcf23204
Monotone-Revision: 9b6f0c65763b57f4f4f3198f2400f943060f7bb4

Monotone-Author: 2843261a3a27d2f3fe1d5b0e3d1d1bc96986a4aa@inverse.ca
Monotone-Date: 2008-12-11T16:45:53
Monotone-Branch: ca.inverse.sogo

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