# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1324628523 0
# Node ID 91a46f726cf47bd4d5b712ac70e08df195c8648b
# Parent  48d35c0c62241c8806379fbe8de9b8176eb78e9b# Parent  3828a61c44dab3d4b4b7de313af29c186db13df5
merge of '7b6523560e839d3775c83d46b3c466732954bb03'
     and 'aa17fd919c5b0e1d9405ceccffb4b2e83487d6aa'