# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1342730310 -7200
# Node ID 01163b17a0281c763225c4a8d05db4fef924fe2f
# Parent  4eb11f0628873297cca43eb1a73848ed0d0bda4e# Parent  67a6978503b7d612e46901ddf9fa3a4bf2a3f229
merge