pidgin: b80f1afa: merge of '92e101e3698042e7600729bc09dec9...

[sulabh at soc.pidgin.im]

-----------------------------------------------------------------
Revision: b80f1afaa189723b6c4156ce603406e9350b5a9a
Ancestor: 92e101e3698042e7600729bc09dec9e28f81de8f
Ancestor: 930d76b5c3f7e4eacec86cd7b8153fc8299a5bb3
Author: sulabh at soc.pidgin.im
Date: 2009-08-24T20:43:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b80f1afaa189723b6c4156ce603406e9350b5a9a

Modified files:
        ChangeLog libpurple/dbus-analyze-functions.py
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/yahoo/libymsg.c libpurple/proxy.c
        pidgin/gtkdialogs.c pidgin/gtknotify.c

ChangeLog: 

merge of '92e101e3698042e7600729bc09dec9e28f81de8f'
     and '930d76b5c3f7e4eacec86cd7b8153fc8299a5bb3'