pidgin: 3817d6fd: merge of '6a834614341327cc0cbbdc38876923...

Mon Sep 28 21:36:36 EDT 2009

-----------------------------------------------------------------
Revision: 3817d6fd81f4052bb57cd8ad113d8ffd8028591b
Ancestor: 6a834614341327cc0cbbdc3887692354df8999e3
Ancestor: 903af32836ce489b57aec5f255ba91e9e675526f
Author: sadrul at pidgin.im
Date: 2009-09-29T01:36:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3817d6fd81f4052bb57cd8ad113d8ffd8028591b

Modified files:
        libpurple/dnsquery.c libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

merge of '6a834614341327cc0cbbdc3887692354df8999e3'
     and '903af32836ce489b57aec5f255ba91e9e675526f'