pidgin: 6f9b56ba: merge of '383b6a0002c1ecea40d3836f462b71...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 6f9b56bae8ad65742fcad2bd26615457c02f27d3
Ancestor: 383b6a0002c1ecea40d3836f462b7119e6c6f473
Ancestor: acfb910199a1f3bb2621328feae0a8d1b8c87f77
Author: nosnilmot at pidgin.im
Date: 2008-05-16T18:21:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6f9b56bae8ad65742fcad2bd26615457c02f27d3

Modified files:
        libpurple/core.c pidgin/gtkblist.c

ChangeLog: 

merge of '383b6a0002c1ecea40d3836f462b7119e6c6f473'
     and 'acfb910199a1f3bb2621328feae0a8d1b8c87f77'