pidgin: c7434c06: merge of 'ab47b66449b213d6fbfc728cc1e8c1...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: c7434c065403708c78a862aacde8febcaff8077a
Ancestor: ab47b66449b213d6fbfc728cc1e8c161bed87755
Ancestor: d1d23cd05745079a820abdcd2310300d0be33c50
Author: khc at pidgin.im
Date: 2009-03-26T05:15:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c7434c065403708c78a862aacde8febcaff8077a

Modified files:
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/yahoo/yahoo_packet.c

ChangeLog: 

merge of 'ab47b66449b213d6fbfc728cc1e8c161bed87755'
     and 'd1d23cd05745079a820abdcd2310300d0be33c50'