pidgin.next.minor: f42c9025: merge of '48c05553bccbe3ea3d6b5d8fdc036b...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: f42c9025190a57ae55424302fd21d2b615a721a9
Ancestor: 48c05553bccbe3ea3d6b5d8fdc036bebf771129f
Ancestor: e4bbe3d158c03089726ec8e69e61d0f56356554c
Author: evands at pidgin.im
Date: 2008-05-07T12:17:01
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/f42c9025190a57ae55424302fd21d2b615a721a9

Modified files:
        COPYRIGHT ChangeLog autogen.sh finch/gntaccount.c
        finch/gntblist.c finch/gntnotify.c finch/gntrequest.c
        finch/gntsound.c finch/libgnt/gntwidget.c
        finch/libgnt/gntwm.c libpurple/conversation.c
        libpurple/idle.c libpurple/log.c libpurple/notify.c
        libpurple/plugins/log_reader.c libpurple/plugins/newline.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/page.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/sync.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/novell/nmuser.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ft.c libpurple/protocols/silc/ops.c
        libpurple/protocols/silc/pk.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/toc/toc.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtknotify.c pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtksavedstatuses.c pidgin/gtksound.c
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/plugins/notify.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/fi.po

ChangeLog: 

merge of '48c05553bccbe3ea3d6b5d8fdc036bebf771129f'
     and 'e4bbe3d158c03089726ec8e69e61d0f56356554c'