pidgin: bd8ab487: merge of '7477b26751dbf08e918a1f300fbd26...

Thu Apr 3 22:50:38 EDT 2008

-----------------------------------------------------------------
Revision: bd8ab487a664927e457c1c8ff14eb70dabafe893
Ancestor: 7477b26751dbf08e918a1f300fbd2697dd0c6369
Ancestor: 911e3a3a992368fcb0a43a90238092e27a92c581
Author: deryni at pidgin.im
Date: 2008-04-04T02:45:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bd8ab487a664927e457c1c8ff14eb70dabafe893

Modified files:
        autogen.sh libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/imgstore.c libpurple/imgstore.h libpurple/notify.c
        libpurple/notify.h libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '7477b26751dbf08e918a1f300fbd2697dd0c6369'
     and '911e3a3a992368fcb0a43a90238092e27a92c581'