# HG changeset patch
# User Dan
# Date 1242432855 14400
# Node ID d2061e3d6991595ce40af55ceca9c716bfd3e9e3
# Parent  1ad055d689fc14225caff079170293b86d4702cd# Parent  74b27f70372407372b50b9d838df6559048bbc7c
Merged accidental split, we should be ready to push out 1.1.6

diff -r 74b27f703724 -r d2061e3d6991 .hgtags