# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190431271 0
# Node ID 964014aee978009014a1721d56153434c06e644c
# Parent  7d072354544ade3912c52305b6368194e5fa3a9e# Parent  2f1c4b2716ea90fe0a7c085b3da28dd0bcf40a08
merge of '025faf23aaac403798451974c320c4de6df470d5'
     and '5c5edb6508adac74635924c3b6fa2676a92323e3'