pidgin: 31cfeb85: merge of '080022da62aff247ec296e6c817cae...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 31cfeb857db37f5ed2d12cf084073349436c89e5
Ancestor: 080022da62aff247ec296e6c817cae0fc476b6a6
Ancestor: 3b1faad42b89245e12673c727b8f0c237e96c798
Author: maiku at soc.pidgin.im
Date: 2009-07-22T03:15:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/31cfeb857db37f5ed2d12cf084073349436c89e5

Modified files:
        libpurple/blist.c libpurple/mediamanager.c
        libpurple/win32/targets.mak pidgin/gtkblist.c

ChangeLog: 

merge of '080022da62aff247ec296e6c817cae0fc476b6a6'
     and '3b1faad42b89245e12673c727b8f0c237e96c798'