pidgin: 62f32465: merge of '0d3ce6dca7222c77b50e8a23fe0ed1...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 62f32465bf3fc9e633905a7a7dabceef2925769e
Ancestor: 0d3ce6dca7222c77b50e8a23fe0ed1bae02928a8
Ancestor: 311b4db51b575e1baa7f78d751ff926475edecc3
Author: rlaager at pidgin.im
Date: 2008-11-13T17:38:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/62f32465bf3fc9e633905a7a7dabceef2925769e

Modified files:
        COPYRIGHT ChangeLog configure.ac
        libpurple/dbus-analyze-functions.py
        libpurple/plugins/perl/common/Notify.xs
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/irc/Makefile.am
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/novell/Makefile.am
        libpurple/protocols/null/Makefile.am
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/silc/Makefile.am
        libpurple/protocols/silc10/Makefile.am
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/toc/Makefile.am
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/zephyr/Makefile.am
        pidgin/plugins/markerline.c

ChangeLog: 

merge of '0d3ce6dca7222c77b50e8a23fe0ed1bae02928a8'
     and '311b4db51b575e1baa7f78d751ff926475edecc3'