pidgin: fffcc1e5: merge of '43597c046102d28beb11884ac70e89...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: fffcc1e5460e5e2966d3860467657a6f50f25ff9
Ancestor: 43597c046102d28beb11884ac70e89943a1b1466
Ancestor: cce3a22f53972bd3834175b08ad5e7b800bf98e9
Author: deryni at pidgin.im
Date: 2008-03-05T01:24:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fffcc1e5460e5e2966d3860467657a6f50f25ff9

Modified files:
        doc/pidgin.1.in libpurple/account.c libpurple/buddyicon.c
        libpurple/plugins/test.pl libpurple/protocols/jabber/buddy.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h pidgin/gtkblist.c
        pidgin/gtkmain.c

ChangeLog: 

merge of '43597c046102d28beb11884ac70e89943a1b1466'
     and 'cce3a22f53972bd3834175b08ad5e7b800bf98e9'