# HG changeset patch
# User blanchet
# Date 1236161102 -3600
# Node ID 3a1aef73b2b20df70467434d8ca057e1027e2cf2
# Parent  5b25fee0362c8a8e31c7249f94a20c1b46d7fecb
Merge.