pidgin: f4609ebf: merge of '4bf270f4acb1ba37f3a3aa264be813...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: f4609ebf8654bf111c5c1913978736383607d823
Ancestor: 4bf270f4acb1ba37f3a3aa264be813d4b16878ed
Ancestor: 97e003ed2bc2bafbb993693c9ae9c6d667731cc1
Author: malu at pidgin.im
Date: 2009-09-07T19:33:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f4609ebf8654bf111c5c1913978736383607d823

Modified files:
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/libymsg.c pidgin/gtksmiley.c

ChangeLog: 

merge of '4bf270f4acb1ba37f3a3aa264be813d4b16878ed'
     and '97e003ed2bc2bafbb993693c9ae9c6d667731cc1'