merge of '177dc270d3d2e9cdaa12bcd9273e1af23ee99d72'

and '75ed7ffc63cde2539fbad2651b19e8b944cba52e'

Monotone-Parent: 177dc270d3d2e9cdaa12bcd9273e1af23ee99d72
Monotone-Parent: 75ed7ffc63cde2539fbad2651b19e8b944cba52e
Monotone-Revision: 04bea15431a5d37d2c52ccda4a30d78b57741793

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-17T19:00:53
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-02-17 19:00:53 +00:00