pidgin: 4bf270f4: merge of '37aa00d044431100d3746651756864...

Mon Sep 7 15:35:28 EDT 2009

-----------------------------------------------------------------
Revision: 4bf270f4acb1ba37f3a3aa264be813d4b16878ed
Ancestor: 37aa00d044431100d37466517568640cb082680c
Ancestor: 7fb07587f5c87cbf108267d40521da8e2ec4d6fd
Author: malu at pidgin.im
Date: 2009-09-07T19:33:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4bf270f4acb1ba37f3a3aa264be813d4b16878ed

Modified files:
        libpurple/protocols/yahoo/libymsg.c pidgin/gtksmiley.c

ChangeLog: 

merge of '37aa00d044431100d37466517568640cb082680c'
     and '7fb07587f5c87cbf108267d40521da8e2ec4d6fd'