pidgin.vv: c95a65b7: merge of '2d0e977ba883c0b9d24d52360839cf...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: c95a65b7b24deeab5f3c217a7f4ed0f8b422c3d3
Ancestor: 2d0e977ba883c0b9d24d52360839cfed7cf1f2a6
Ancestor: e9514d92cd62759a80a75f93b308e4fd05afe673
Author: maiku at soc.pidgin.im
Date: 2009-03-30T04:15:53
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/c95a65b7b24deeab5f3c217a7f4ed0f8b422c3d3

Modified files:
        finch/gntmedia.c finch/gntmedia.h finch/gntui.c
        pidgin/gtkmedia.c

ChangeLog: 

merge of '2d0e977ba883c0b9d24d52360839cfed7cf1f2a6'
     and 'e9514d92cd62759a80a75f93b308e4fd05afe673'