# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1367506300 -7200
# Node ID 5a3a4a25e56803102b5c580b5e466bbe836f97cb
# Parent  941ea46e9e267b801a57f8b9dbaf785c7593ecd7# Parent  2d269089078fcf42ffa702c9748222314e3d9b6a
reintegration from mainline