# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1324291036 -3600
# Node ID 3774706bfb80bc8f4de2dbd191e652c028da4a42
# Parent  6562ec5e6139143926a153b8696a96212be61687# Parent  6207e9dd38095e7b8f4a34d0d63f6245190923c7
Merge with b3a6ab49a2db9929f2b40025dc68cd15e4030b70