pidgin: bca56d60: merge of '35051ef78ac9fe0b4c494411560d1b...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: bca56d60292040ef7de64e6409cb17f7870ee413
Ancestor: 35051ef78ac9fe0b4c494411560d1b9dc566f414
Ancestor: e04b036036f9bcede5b8bb241f0d8e266745de89
Author: darkrain42 at pidgin.im
Author: sadrul at pidgin.im
Date: 2009-11-01T03:17:03
Date: 2009-11-01T03:18:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bca56d60292040ef7de64e6409cb17f7870ee413

Modified files:
        libpurple/dnsquery.c libpurple/dnssrv.c

ChangeLog: 

merge of '35051ef78ac9fe0b4c494411560d1b9dc566f414'
     and 'e04b036036f9bcede5b8bb241f0d8e266745de89'