pidgin: aedf94cc: merge of '319edba55f1c66810f6a7a2af17e80...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: aedf94cca64dd46503c2482445e6de4e9816b7df
Ancestor: 319edba55f1c66810f6a7a2af17e808a5bc75e3e
Ancestor: 6ffba0724b246f1a87f83b1b19299aefcdd48142
Author: darkrain42 at pidgin.im
Date: 2009-08-16T05:23:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aedf94cca64dd46503c2482445e6de4e9816b7df

Modified files:
        ChangeLog finch/libgnt/gntkeys.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c

ChangeLog: 

merge of '319edba55f1c66810f6a7a2af17e808a5bc75e3e'
     and '6ffba0724b246f1a87f83b1b19299aefcdd48142'