# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1173027145 0
# Node ID 2ed235b0f97eed468d0e3656176040055940deb3
# Parent  c7a7ea7c07a87571864e60630e0d0acbcfa1d356# Parent  c6ad254c1b89cae1270a0bf0ea2a0fb9b3d2cf75
merge of '01e79f9c7ec957a574f7f14ad3c02de473d744b9'
     and '999bc03286f1871ff88fb52b4915f642de62dcef'