pidgin: f692c258: merge of 'a543de79fc730fb1a32056d0da5abe...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f692c258ca8f5dabfcf69ca9b2578e7bad37bdd0
Ancestor: a543de79fc730fb1a32056d0da5abe0044ed9533
Ancestor: bbeb29e959037b31d07ee20b3d7554c3e82bf826
Author: darkrain42 at pidgin.im
Date: 2009-05-10T22:41:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f692c258ca8f5dabfcf69ca9b2578e7bad37bdd0

Modified files:
        libpurple/internal.h libpurple/protocols/msn/slplink.c
        libpurple/protocols/myspace/myspace.c

ChangeLog: 

merge of 'a543de79fc730fb1a32056d0da5abe0044ed9533'
     and 'bbeb29e959037b31d07ee20b3d7554c3e82bf826'