pidgin: dd9f40f3: merge of '7df8a2a726d522f0120b6cec62f683...

[sulabh at soc.pidgin.im]

-----------------------------------------------------------------
Revision: dd9f40f3139be5d2a0aababd7d892cb5be3cd3d2
Ancestor: 7df8a2a726d522f0120b6cec62f683503591a040
Ancestor: 84b498a1a946a202a794740f53b1086b9e22343c
Author: sulabh at soc.pidgin.im
Date: 2009-10-24T07:57:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dd9f40f3139be5d2a0aababd7d892cb5be3cd3d2

Modified files:
        ChangeLog libpurple/protocols/msn/oim.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

merge of '7df8a2a726d522f0120b6cec62f683503591a040'
     and '84b498a1a946a202a794740f53b1086b9e22343c'