pidgin.vv: 2e656291: merge of '856023a0b4273c54f6041597332bd5...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 2e6562913a4dbc5c445c4bfddb0ea6b24767a179
Ancestor: 856023a0b4273c54f6041597332bd5a0fb63ea0e
Ancestor: e13834da8fb12496c12a2b1bbee9fd93028a75b1
Author: maiku at soc.pidgin.im
Date: 2009-01-08T04:10:38
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/2e6562913a4dbc5c445c4bfddb0ea6b24767a179

Modified files:
        libpurple/media.c libpurple/protocols/jabber/google.c
        pidgin/gtkconv.c pidgin/gtkmedia.c

ChangeLog: 

merge of '856023a0b4273c54f6041597332bd5a0fb63ea0e'
     and 'e13834da8fb12496c12a2b1bbee9fd93028a75b1'