im.pidgin.pidgin: 7002e900cf6a9a610849fa4d5c2d0dbe981d1f5e

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 7002e900cf6a9a610849fa4d5c2d0dbe981d1f5e
Ancestor: 535e513c571856e9e31d51a83dca552c8a8433dc
Ancestor: c1bdec9375bee85ed8f1e7bcfcd60fac3ae61f62
Author: nosnilmot at pidgin.im
Date: 2007-11-10T22:32:26
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '535e513c571856e9e31d51a83dca552c8a8433dc'
     and 'c1bdec9375bee85ed8f1e7bcfcd60fac3ae61f62'