pidgin: 12b9c027: merge of '68d7b3372f34b6420c91d6185b8128...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 12b9c02788253d50b8dbabc5e2c9c42c9ae2bd7e
Ancestor: 68d7b3372f34b6420c91d6185b81282d1c68b547
Ancestor: a0b2c783a2e0d0d5cd83d13ee1ce1d078b174ba3
Author: evands at pidgin.im
Date: 2008-07-20T05:53:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/12b9c02788253d50b8dbabc5e2c9c42c9ae2bd7e

Modified files:
        configure.ac libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/prpl.c
        libpurple/prpl.h libpurple/server.c libpurple/server.h
        libpurple/win32/libc_interface.c pidgin/gtkaccount.c

ChangeLog: 

merge of '68d7b3372f34b6420c91d6185b81282d1c68b547'
     and 'a0b2c783a2e0d0d5cd83d13ee1ce1d078b174ba3'