# HG changeset patch
# User Alexis
# Date 2010-12-02 06:13:52
# Node ID 41e13873cafee4d1f713a1ce022cb109cbf05369
# Parent  4ef18b3e796e29632306fed3b7f7f29ec3916cb7
# Parent  1d0118715bf09932095f56c68581d6480b3728fb

Merge with last Martin update