# HG changeset patch
# User blanchet
# Date 1276333974 -7200
# Node ID e6b1a0693f3fc89cec345e278276254045639230
# Parent  fe6262d929a3090133e14b5d8b213d3d6b0504f7# Parent  7e3d7af862150ae826185ebc344fd119de7ffb48
merged