pidgin: ef6141be: merge of 'e8e119ae079526a36af0f2ac20e7a9...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: ef6141be3fa75ac5dce43df3dd9b62d057a923d1
Ancestor: e8e119ae079526a36af0f2ac20e7a9c9900f44c1
Ancestor: fd4c0f3ddcd7c122d22e7fb569ff904e79df6ffb
Author: markdoliner at pidgin.im
Date: 2009-08-20T01:12:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ef6141be3fa75ac5dce43df3dd9b62d057a923d1

Modified files:
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c pidgin/gtkconv.c

ChangeLog: 

merge of 'e8e119ae079526a36af0f2ac20e7a9c9900f44c1'
     and 'fd4c0f3ddcd7c122d22e7fb569ff904e79df6ffb'