pidgin: e2c74900: merge of '5d299fb56a8e77822296cd70281b61...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: e2c7490064174ae96e21a71df1d0e9297658cb3d
Ancestor: 5d299fb56a8e77822296cd70281b61ed0fa3b613
Ancestor: 9c25d032749a8658166756edb40cd7b1a0654efe
Author: darkrain42 at pidgin.im
Date: 2009-07-28T02:37:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e2c7490064174ae96e21a71df1d0e9297658cb3d

Added files:
        libpurple/valgrind.h
Modified files:
        ChangeLog libpurple/Makefile.am libpurple/accountopt.c
        libpurple/blist.c libpurple/media.c libpurple/plugin.c
        libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkmedia.c

ChangeLog: 

merge of '5d299fb56a8e77822296cd70281b61ed0fa3b613'
     and '9c25d032749a8658166756edb40cd7b1a0654efe'