merge of '4cbfcc8ac9c9c474165cdf1d49e3c456e68e8179'

and 'b87314f50be5175b5fd1b2c7feb0392d150c09d1'

Monotone-Parent: 4cbfcc8ac9c9c474165cdf1d49e3c456e68e8179
Monotone-Parent: b87314f50be5175b5fd1b2c7feb0392d150c09d1
Monotone-Revision: bbfd022d80898c181e73d1d08a067e237d9499bc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-04T19:55:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-10-04 19:55:52 +00:00