pidgin: 42764965: merge of '5ca4fe18a853bb7a6d9c45cd96ce2e...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 42764965ca944708fa38788a702eef42ce73ce64
Ancestor: 5ca4fe18a853bb7a6d9c45cd96ce2e9da4a2f8b8
Ancestor: 888e6ea856a320f298628491af64116f42f6aec6
Author: darkrain42 at pidgin.im
Date: 2009-08-21T07:54:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/42764965ca944708fa38788a702eef42ce73ce64

Modified files:
        COPYRIGHT libpurple/protocols/jabber/buddy.c
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c

ChangeLog: 

merge of '5ca4fe18a853bb7a6d9c45cd96ce2e9da4a2f8b8'
     and '888e6ea856a320f298628491af64116f42f6aec6'