pidgin: 8f2b3a70: merge of '9dd1c4c3db68a80dbf157a0c0bc0c7...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 8f2b3a7063a7a0e5cae9de55e55f7066c0d202d6
Ancestor: 9dd1c4c3db68a80dbf157a0c0bc0c723e42b7a6e
Ancestor: b786784e702c7cc7da7894e0de379cdaf56598c2
Author: khc at pidgin.im
Date: 2009-05-02T19:14:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8f2b3a7063a7a0e5cae9de55e55f7066c0d202d6

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

ChangeLog: 

merge of '9dd1c4c3db68a80dbf157a0c0bc0c723e42b7a6e'
     and 'b786784e702c7cc7da7894e0de379cdaf56598c2'