pidgin: bc55c780: merge of '2448add898018349b64e4eb5550adb...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: bc55c7801bc5134246b22d54d98438975a005788
Ancestor: 2448add898018349b64e4eb5550adb03644790db
Ancestor: 8ecad8981a627be745b45a1cd8e5e545f31d1395
Author: darkrain42 at pidgin.im
Date: 2009-04-28T23:03:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bc55c7801bc5134246b22d54d98438975a005788

Modified files:
        libpurple/dnssrv.c libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_locate.c

ChangeLog: 

merge of '2448add898018349b64e4eb5550adb03644790db'
     and '8ecad8981a627be745b45a1cd8e5e545f31d1395'