pidgin: 8bc0a157: merge of '7fe056535dca3e50f6489654f491a2...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258
Ancestor: 7fe056535dca3e50f6489654f491a2f9e487b4d4
Ancestor: e3a6ef7390d7890b02866222f5f347f383cd6a48
Author: darkrain42 at pidgin.im
Date: 2010-06-18T20:14:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258

Modified files:
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

merge of '7fe056535dca3e50f6489654f491a2f9e487b4d4'
     and 'e3a6ef7390d7890b02866222f5f347f383cd6a48'