# HG changeset patch
# User Vincent Tondellier <tonton+hg@team1664.org>
# Date 1336080242 -7200
# Node ID dd695a90efd6df751ded9a0f1e4eb4f8dc7b7940
# Parent  989accf1fe23c82b16d04c075bfcdf24e8e0fe73# Parent  2f224f085623c3a787d9761b5ffcd10bfb17dea8
Merge