# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190636082 0
# Node ID c1b559a2610f29af119e32f807e71e9a7af35755
# Parent  275fe4d671589324e10151329230d934fd97d6cf# Parent  31f4199a4cd436ad9fdb745954b1b399a1ff242e
merge of '31d62e1a78974a0239e86bfeb42b29ab75216114'
     and '9ac69ea809d7739080783dc7f3de14cfcf9325d3'