# HG changeset patch
# User Evan Schoenberg <evands@pidgin.im>
# Date 1172251233 0
# Node ID 0212d6f8dc4bfc2bc5624fd021f52c6b8fe99385
# Parent  c238e0966eb1dd2753de002c9a3ab84c322e325e# Parent  d13a561c934e6dbf83fffa9784a9b24bfe8ea9b2
merge of 'c238e0966eb1dd2753de002c9a3ab84c322e325e'
     and 'd13a561c934e6dbf83fffa9784a9b24bfe8ea9b2'