# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1177030050 0
# Node ID c14a05c00484832478c6d748270ae4c09f9b355c
# Parent  a68fffb647d09038690036e1ff20cf78dbd34742# Parent  eae8f64218bab7336cc1bc6c14255f4147704b24
merge of '6b7a5fb8f33d3f1801a33540b42b5fb01b69511a'
     and '7d305ece871339300b733aa498ca247d21b5aa41'