# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1189602042 0
# Node ID ebf4fe12ad1056b350e7e416bfddf5e7ff760847
# Parent  1534c0b664c02744d23b2a8caeccd3583f7bc448# Parent  03b0f382dd7cc2737ec170e1d35cd7a0c6aae404
merge of '568fa1d06eec5b85c215976c97bba59da8c139a7'
     and 'b5d08ea2ffcf40d88397c533814778a4675f6cf5'