im.pidgin.pidgin: 4ac79800f2efc2dbe9a348189a545b149d6dfb44

[charkins at pidgin.im]

-----------------------------------------------------------------
Revision: 4ac79800f2efc2dbe9a348189a545b149d6dfb44
Ancestor: 60c313e0859ab5b5106920e3133826ed0ec09703
Ancestor: 9af00415175d29e7e9227c383939d392ea0af499
Author: charkins at pidgin.im
Date: 2007-10-15T04:14:53
Branch: im.pidgin.pidgin

Modified files:
        libpurple/buddyicon.c libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdocklet.c

ChangeLog: 

merge of '60c313e0859ab5b5106920e3133826ed0ec09703'
     and '9af00415175d29e7e9227c383939d392ea0af499'