pidgin: 7f098fe0: merge of '42ff94691667fa47b66d698b59f9ec...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7f098fe0d5bc6279fc094a4ae91ea47d8333c500
Ancestor: 42ff94691667fa47b66d698b59f9eca2326c3660
Ancestor: 90b0bd90767d8c909b65e673e4112c798e3af479
Author: darkrain42 at pidgin.im
Date: 2009-07-03T04:27:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7f098fe0d5bc6279fc094a4ae91ea47d8333c500

Modified files:
        libpurple/account.c libpurple/blist.c
        libpurple/certificate.c libpurple/cipher.c
        libpurple/dnsquery.c libpurple/imgstore.c
        libpurple/network.c libpurple/plugin.c
        libpurple/pluginpref.c libpurple/protocols/msn/state.c
        libpurple/proxy.c libpurple/stun.c libpurple/upnp.c
        libpurple/win32/win32dep.c pidgin/gtkaccount.c
        pidgin/gtknotify.c pidgin/gtkprefs.c pidgin/gtksmiley.c
        pidgin/plugins/themeedit-icon.c

ChangeLog: 

merge of '42ff94691667fa47b66d698b59f9eca2326c3660'
     and '90b0bd90767d8c909b65e673e4112c798e3af479'