# HG changeset patch
# User "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
# Date 1152961786 -7200
# Node ID f7be7babc75a488ff5c9e4702bea3e56c634d454
# Parent  114790d3a08177d0ffd470d0417c14175e02458c
[mq]: merge marker