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

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: befd3ff0e7dd20f612c653ad773327de142fa5e9
Ancestor: 403c70a10f0947c6a968f38acae33715ffad2fce
Ancestor: db81111b84429495bfadbf169b190bf5b0d22535
Author: maiku at soc.pidgin.im
Date: 2009-01-10T01:29:41
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/befd3ff0e7dd20f612c653ad773327de142fa5e9

Modified files:
        libpurple/media.c libpurple/media.h
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/transport.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '403c70a10f0947c6a968f38acae33715ffad2fce'
     and 'db81111b84429495bfadbf169b190bf5b0d22535'