# HG changeset patch
# User catherine@cordelia
# Date 1241058924 14400
# Node ID fd5197498667fec7cee0698f2b6c58a265aafa95
# Parent  d68d83f4225470108002095f4a030ee73bcbddbb# Parent  fd40eca6939a0ec4d50185c4bc4bce93a78b536f
merge

diff -r d68d83f42254 -r fd5197498667 cmd2.py