pidgin: 2b7afd5f: merge of '4863b4eccaac4e374451b708e54a87...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2b7afd5f3a168b013e5d3cd69999ffb6e0ee95a6
Ancestor: 4863b4eccaac4e374451b708e54a87e6f723a7e0
Ancestor: e665801bd2ca5d96a2f3b3ca39cb56a1d6960593
Author: darkrain42 at pidgin.im
Date: 2009-05-10T23:41:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2b7afd5f3a168b013e5d3cd69999ffb6e0ee95a6

Modified files:
        libpurple/dbus-analyze-functions.py
        libpurple/protocols/jabber/google.c

ChangeLog: 

merge of '4863b4eccaac4e374451b708e54a87e6f723a7e0'
     and 'e665801bd2ca5d96a2f3b3ca39cb56a1d6960593'