adium.1-3: b27d88f9: merge of '898b964a967c87502f1793757b405e...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: b27d88f90b41b63665b9a3e02cdf046f00aee134
Ancestor: 898b964a967c87502f1793757b405e60879021ae
Ancestor: e8581a4c2a777afc5ce8a3d8d7ebb17d9cf93106
Author: zacw at adiumx.com
Date: 2009-07-09T21:03:02
Branch: im.pidgin.adium.1-3
URL: http://d.pidgin.im/viewmtn/revision/info/b27d88f90b41b63665b9a3e02cdf046f00aee134

Modified files:
        libpurple/protocols/jabber/google.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_picture.h libpurple/util.c

ChangeLog: 

merge of '898b964a967c87502f1793757b405e60879021ae'
     and 'e8581a4c2a777afc5ce8a3d8d7ebb17d9cf93106'