pidgin.vv: e9514d92: merge of '09e919e395cff260ab58aee3aec040...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: e9514d92cd62759a80a75f93b308e4fd05afe673
Ancestor: 09e919e395cff260ab58aee3aec04058c5f128b9
Ancestor: 19dc1175b3648701e3d873038fbd2bb955afea8f
Author: maiku at soc.pidgin.im
Date: 2009-03-30T04:15:52
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/e9514d92cd62759a80a75f93b308e4fd05afe673

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

ChangeLog: 

merge of '09e919e395cff260ab58aee3aec04058c5f128b9'
     and '19dc1175b3648701e3d873038fbd2bb955afea8f'