pidgin.vv: db81111b: merge of 'a617f86bc9f9f151daef5b0980c124...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: db81111b84429495bfadbf169b190bf5b0d22535
Ancestor: a617f86bc9f9f151daef5b0980c124f94f277f9a
Ancestor: dca923f5c49ff1a1638b3ac1529f82d846737578
Author: maiku at soc.pidgin.im
Date: 2009-01-10T01:29:40
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/db81111b84429495bfadbf169b190bf5b0d22535

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 'a617f86bc9f9f151daef5b0980c124f94f277f9a'
     and 'dca923f5c49ff1a1638b3ac1529f82d846737578'