pidgin: 3e47f0f6: merge of '052b844e0de47c283f4eefb3e5c9d5...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3e47f0f65ae33e37ab711ec7b2fd8aeeae1efcd7
Ancestor: 052b844e0de47c283f4eefb3e5c9d511dbb287aa
Ancestor: 27b0c8383de99fccc9cd6f312ac355f9e4a4d267
Author: sadrul at pidgin.im
Date: 2009-07-15T03:19:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3e47f0f65ae33e37ab711ec7b2fd8aeeae1efcd7

Modified files:
        libpurple/privacy.h libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h

ChangeLog: 

merge of '052b844e0de47c283f4eefb3e5c9d511dbb287aa'
     and '27b0c8383de99fccc9cd6f312ac355f9e4a4d267'