pidgin: 8c1fa13e: merge of '321bf1cf9bafe529fea060ca8ba086...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 8c1fa13e01e278e3a2c91c7c595ff091b87f0c3c
Ancestor: 321bf1cf9bafe529fea060ca8ba08686a57e884a
Ancestor: 642328237c74a9195beb3c18c0f31143545c1f8c
Author: sadrul at pidgin.im
Date: 2009-07-01T00:18:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8c1fa13e01e278e3a2c91c7c595ff091b87f0c3c

Modified files:
        ChangeLog libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_picture.h

ChangeLog: 

merge of '321bf1cf9bafe529fea060ca8ba08686a57e884a'
     and '642328237c74a9195beb3c18c0f31143545c1f8c'