pidgin: 46e26786: merge of '17fcb3e7ac74579122bb5259359cef...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 46e26786ecd3bebc04997a2701f8382d76cd958e
Ancestor: 17fcb3e7ac74579122bb5259359cef56f5bbf713
Ancestor: b721192f0b7c409b2f6d8829fc79087ee7587bfb
Author: darkrain42 at pidgin.im
Date: 2010-05-12T05:21:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/46e26786ecd3bebc04997a2701f8382d76cd958e

Modified files:
        libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/slplink.c

ChangeLog: 

merge of '17fcb3e7ac74579122bb5259359cef56f5bbf713'
     and 'b721192f0b7c409b2f6d8829fc79087ee7587bfb'