# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1177832440 0
# Node ID 8ef2d30bc1bfa3a3f1bd9123f78d1f5c5176b62c
# Parent  985bf8c7b8d11b52f1161beb74ce4fee177a31d5# Parent  a017913160cd5866c153712be0e6213565493039
merge of '7dbb9ed2994bf4252f9ae93a2eb6072800082022'
     and 'd03e6584d548b2fec6afd50eccf79344570173f3'