merge of '1fb3121c84e0bb2773973fcfde109c7b26530951'

and '3b05428c1c26f8039e60ec4b3d67714b8d3c2f95'

Monotone-Parent: 1fb3121c84e0bb2773973fcfde109c7b26530951
Monotone-Parent: 3b05428c1c26f8039e60ec4b3d67714b8d3c2f95
Monotone-Revision: d073d1d434e8c6c57d9c0f53a3cac4c19354b6f7

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-17T03:28:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-08-17 03:28:13 +00:00