im.pidgin.pidgin: cf4d95df46ab2c4bea54a9fee1015441f2770bf6

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: cf4d95df46ab2c4bea54a9fee1015441f2770bf6
Ancestor: 4d5bbc54236419e777e3df044678b798605409bf
Ancestor: a3511433f0830f88e2e470b22fd2c706e2aa7713
Author: evands at pidgin.im
Date: 2007-10-15T01:44:52
Branch: im.pidgin.pidgin

Modified files:
        libpurple/buddyicon.c libpurple/prefs.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkutils.c

ChangeLog: 

merge of '4d5bbc54236419e777e3df044678b798605409bf'
     and 'a3511433f0830f88e2e470b22fd2c706e2aa7713'