adium.1-3: f853f76d: merge of '18b0a096bd6f21011f16c7b08c1aac...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: f853f76dc2f081e519527763cd86f02a1296ec63
Ancestor: 18b0a096bd6f21011f16c7b08c1aac016d2c0fff
Ancestor: ccdb44b03ebf0792b3b57531c03ae4e66086d8e2
Author: zacw at adiumx.com
Date: 2009-07-09T20:43:20
Branch: im.pidgin.adium.1-3
URL: http://d.pidgin.im/viewmtn/revision/info/f853f76dc2f081e519527763cd86f02a1296ec63

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

ChangeLog: 

merge of '18b0a096bd6f21011f16c7b08c1aac016d2c0fff'
     and 'ccdb44b03ebf0792b3b57531c03ae4e66086d8e2'