# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1177832377 0
# Node ID 985bf8c7b8d11b52f1161beb74ce4fee177a31d5
# Parent  ce913744ec7a92e5ae2bfceefce2785ad6e753e9# Parent  ee36e4bd84ca54806559481116aca64e551b762c
merge of '5d2bf67f21822e51ffd4611f98cb0921564ff2b1'
     and 'a378fe8f729ea78fcd5280cc0b37072840f3b8ad'