pidgin: 1febcb1d: merge of '2b67a6080c2cabe152977731157b42

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 1febcb1dfa6108b731759c97530273ad322c1e29
Ancestor: 2b67a6080c2cabe152977731157b424f9e83dd5c
Ancestor: f25f4d846c906ec908881571d5279d50893652f0
Author: kstange at pidgin.im
Date: 2008-03-02T22:35:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1febcb1dfa6108b731759c97530273ad322c1e29

Modified files:
        libpurple/plugin.c libpurple/protocols/myspace/markup.c
        pidgin/gtkplugin.c

ChangeLog: 

merge of '2b67a6080c2cabe152977731157b424f9e83dd5c'
     and 'f25f4d846c906ec908881571d5279d50893652f0'