im.pidgin.pidgin: 29a6e3789a996fbd9446c3c130c83f5c808898fc

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 29a6e3789a996fbd9446c3c130c83f5c808898fc
Ancestor: 5e11f89fad2bba2d5ef3307befb618c9ca110561
Ancestor: 6876f96b926c6734531d2353ef014328769d2ae6
Author: nosnilmot at pidgin.im
Date: 2008-02-14T12:42:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/29a6e3789a996fbd9446c3c130c83f5c808898fc

Modified files:
        finch/gntconv.c finch/libgnt/gntbutton.c
        finch/libgnt/gntcombobox.c finch/libgnt/gntentry.c
        finch/libgnt/gntfilesel.c finch/libgnt/gnttree.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c pidgin/gtkconv.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '5e11f89fad2bba2d5ef3307befb618c9ca110561'
     and '6876f96b926c6734531d2353ef014328769d2ae6'