pidgin: 4851f233: merge of '373dcef37042813bc15485de75725e...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 4851f233d1f035333ee24f82cae392f372a68104
Ancestor: 373dcef37042813bc15485de75725e625a149bf6
Ancestor: 7e9f703c79d2df50e7d864dd84bb88ef8c1b60ec
Author: datallah at pidgin.im
Date: 2009-02-03T02:43:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4851f233d1f035333ee24f82cae392f372a68104

Modified files:
        libpurple/dbus-analyze-functions.py
        libpurple/protocols/oscar/oscar.h
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '373dcef37042813bc15485de75725e625a149bf6'
     and '7e9f703c79d2df50e7d864dd84bb88ef8c1b60ec'