pidgin: 432372c2: merge of '22e14265a47cdddb4c9eb1ee0d2ce2...

Tue Jun 30 16:55:30 EDT 2009

-----------------------------------------------------------------
Revision: 432372c21ad4e6653ca5e193fb6da6b72001ccdf
Ancestor: 22e14265a47cdddb4c9eb1ee0d2ce2989f9fce61
Ancestor: 466751d2dfe5355917927b662a6d30c4a975c42a
Author: sadrul at pidgin.im
Date: 2009-06-30T20:52:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/432372c21ad4e6653ca5e193fb6da6b72001ccdf

Modified files:
        ChangeLog libpurple/dnssrv.c libpurple/dnssrv.h
        libpurple/protocols/yahoo/yahoo.c libpurple/util.c
        pidgin/gtkblist-theme-loader.c po/ca.po

ChangeLog: 

merge of '22e14265a47cdddb4c9eb1ee0d2ce2989f9fce61'
     and '466751d2dfe5355917927b662a6d30c4a975c42a'