Bring in small fixes from trunk Monotone-Parent: 18bd3484373fa731cf9a3ac7ca3ce35afbf03cdd Monotone-Revision: 1efb09bf023898a5a0088c9ba29ca00f1a304611 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-02-02T18:05:36
Monotone-Parent: a23f9b6b633e53869f52361213e6478e36384813 Monotone-Revision: dab3668bce4278be22f243f5c2d650104d8d89fe Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-10-07T17:11:24 Monotone-Branch: ca.inverse.sogo