pidgin.vv: a43fe390: merge of '403c70a10f0947c6a968f38acae337...

Tue Jan 13 13:52:09 EST 2009

-----------------------------------------------------------------
Revision: a43fe39095ee00967fa35f7fc14ecd698c4b3241
Ancestor: 403c70a10f0947c6a968f38acae33715ffad2fce
Ancestor: dca923f5c49ff1a1638b3ac1529f82d846737578
Author: malu at pidgin.im
Date: 2009-01-10T01:27:48
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/a43fe39095ee00967fa35f7fc14ecd698c4b3241

Modified files:
        libpurple/media.c pidgin/gtkprefs.c

ChangeLog: 

merge of '403c70a10f0947c6a968f38acae33715ffad2fce'
     and 'dca923f5c49ff1a1638b3ac1529f82d846737578'