pidgin: 3b4015ec: merge of 'c79c76ef54b9b6ee38720172c7cc65...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3b4015ec1651c49bc8a50a1682030b7ffe6413e0
Ancestor: c79c76ef54b9b6ee38720172c7cc655dcee22893
Ancestor: ce52a4af6787aad5221596cca9b17c86441bad96
Author: sadrul at pidgin.im
Date: 2009-07-10T19:29:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3b4015ec1651c49bc8a50a1682030b7ffe6413e0

Modified files:
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/tests/test_jabber_jutil.c

ChangeLog: 

merge of 'c79c76ef54b9b6ee38720172c7cc655dcee22893'
     and 'ce52a4af6787aad5221596cca9b17c86441bad96'