pidgin: 7347c33c: merge of 'a06b635ebc40ccdad112528557020c...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 7347c33cabd303ddbcb162b7ad7899f3dac480ba
Ancestor: a06b635ebc40ccdad112528557020cfd60238d88
Ancestor: c22d824152072143b7ba7eb8b365c97069c60761
Author: sadrul at pidgin.im
Date: 2008-05-26T03:42:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7347c33cabd303ddbcb162b7ad7899f3dac480ba

Modified files:
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkutils.c

ChangeLog: 

merge of 'a06b635ebc40ccdad112528557020cfd60238d88'
     and 'c22d824152072143b7ba7eb8b365c97069c60761'