merge of '6d629d88d3b01fa71fac5c998333eed2c61c6232'

and 'a0aad18e83de9385156d83958ccb5e65c0a45d62'

Monotone-Parent: 6d629d88d3b01fa71fac5c998333eed2c61c6232
Monotone-Parent: a0aad18e83de9385156d83958ccb5e65c0a45d62
Monotone-Revision: 7842c8950fe912d981925f06e3b7a2f432bc5f2a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-26T15:16:33
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-10-26 15:16:33 +00:00