# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1355480664 -3600
# Node ID b3322636b06d8abb064384de7f1c2ccd388bae33
# Parent  ffd98d2f0b911c6f54bfb064c50da74217af08dc# Parent  b0734fbcdd978b15fc9ab869919fff8031afe5df
merge