# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1190289777 0
# Node ID d954e25e21c05087c0ae2ea048ea65a533b4e2c0
# Parent  96b0d1b3111bbf8d0ec0462c1c82147a716586da# Parent  e172db483c073f929ab52d2fbec7f280b5e37e78
merge of '6cb0c90b1044b61c7a2c1a7d78c55ef4c5af2bfb'
     and '98100504d118cf6a92ceb2c94d79aefbd149c73b'