# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1321283714 -3600
# Node ID d39a06f088e450fbe6d4c68b45dbef892a886c4d
# Parent  e6820078c32c077ed05729877531f289ab720926# Parent  95421370ea9e1f4814167a22cf3caab2d4c8968c
Merge with 3455d90f3e64b37c29ff80e78b064026aa38326c