# HG changeset patch
# User Franck Deroche <franck@defr.org>
# Date 1279285355 -7200
# Node ID a54d04d765549b3d969d95bba5368665bce1df73
# Parent  af6627970bc4ec2babaab7a9a1d58632a1c6a3cb# Parent  b9cd179a30a8f31246846db769922fd5c80311c1
Merge old changeset to get back to a single head