# HG changeset patch
# User herrick
# Date 1246914664 14400
# Node ID 047dd27fddb607f8135296b3754131f6e13cb8c7
# Parent  f982791bb7d40eab9a8318e2c896520dbe042bd5# Parent  863559dbbced657136732ace9e690323f5c6bcff
Merge