pidgin: 417d3f2a: merge of '4b37450c5470f1f61cdba5cf5de7a6...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 417d3f2a251836352291a67202d85b7d82e97439
Ancestor: 4b37450c5470f1f61cdba5cf5de7a6abb166b2c1
Ancestor: c61d5559bb5cfd55defb3613015e9118dbc2184e
Author: darkrain42 at pidgin.im
Date: 2009-08-28T00:00:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/417d3f2a251836352291a67202d85b7d82e97439

Modified files:
        libpurple/util.c libpurple/util.h pidgin/gtkmedia.c

ChangeLog: 

merge of '4b37450c5470f1f61cdba5cf5de7a6abb166b2c1'
     and 'c61d5559bb5cfd55defb3613015e9118dbc2184e'