pidgin: 70ee1de1: merge of '2b7afd5f3a168b013e5d3cd69999ff...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 70ee1de1cc79688256a3dd6ac1a519e24c00a12c
Ancestor: 2b7afd5f3a168b013e5d3cd69999ffb6e0ee95a6
Ancestor: 2c9a1153bc1694e9656752a73526bd6b7461265b
Author: khc at pidgin.im
Date: 2009-05-11T01:37:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/70ee1de1cc79688256a3dd6ac1a519e24c00a12c

Modified files:
        libpurple/dbus-analyze-functions.py
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/qq/qq_crypt.c

ChangeLog: 

merge of '2b7afd5f3a168b013e5d3cd69999ffb6e0ee95a6'
     and '2c9a1153bc1694e9656752a73526bd6b7461265b'