merge of 'd124c012f70febcfcbb9a2b5d4f3a20a7a001d7a'
and 'dc27f9e63f17e21dca5f0eca9226336de591e299' Monotone-Parent: d124c012f70febcfcbb9a2b5d4f3a20a7a001d7a Monotone-Parent: dc27f9e63f17e21dca5f0eca9226336de591e299 Monotone-Revision: 5f06eea4bed0099215d8a10c86ab93337557a176 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-09-09T15:53:41 Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
204dcd6e7a