pidgin: 40ec1f04: merge of '05d22685de7c7e91a18724eccf5ecf...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 40ec1f048551727aa8ebbedc7c5c8752dc517780
Ancestor: 05d22685de7c7e91a18724eccf5ecf6791146239
Ancestor: 3ca58814bdd8642da208ea36f34f9a752fd4bf1b
Author: darkrain42 at pidgin.im
Date: 2009-08-06T03:23:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/40ec1f048551727aa8ebbedc7c5c8752dc517780

Modified files:
        finch/gntaccount.c libpurple/protocols/jabber/buddy.c
        pidgin.spec.in

ChangeLog: 

merge of '05d22685de7c7e91a18724eccf5ecf6791146239'
     and '3ca58814bdd8642da208ea36f34f9a752fd4bf1b'