pidgin: 9409309c: merge of '457a5c2c9d9b1b235deae2d65b24cc...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 9409309cfd4634425fdacbdb3d751afd0bc89a84
Ancestor: 457a5c2c9d9b1b235deae2d65b24cc542c12d6e4
Ancestor: 9ec416e2eb1f0572caf75fe80faa283d3b57deac
Author: khc at pidgin.im
Date: 2008-06-08T21:44:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9409309cfd4634425fdacbdb3d751afd0bc89a84

Modified files:
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '457a5c2c9d9b1b235deae2d65b24cc542c12d6e4'
     and '9ec416e2eb1f0572caf75fe80faa283d3b57deac'