# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190314774 0
# Node ID 01e82c562e59756b72284bb53495bae738a64937
# Parent  73b18278c04e9ee34c59c6947b6cd10fc2e26909# Parent  d954e25e21c05087c0ae2ea048ea65a533b4e2c0
merge of '3bb908cd6c040c3dbcefdcfead20de7044a7e217'
     and 'f8fd3503f8bc4226098a4fccf400e58867dfbca0'