pidgin: e665801b: merge of '19b202a7eff53542a31f52433aa8bc...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: e665801bd2ca5d96a2f3b3ca39cb56a1d6960593
Ancestor: 19b202a7eff53542a31f52433aa8bc17649f8b3d
Ancestor: f692c258ca8f5dabfcf69ca9b2578e7bad37bdd0
Author: paul at darkrain42.org
Date: 2009-05-10T23:15:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e665801bd2ca5d96a2f3b3ca39cb56a1d6960593

Modified files:
        libpurple/protocols/jabber/google.c
        libpurple/protocols/msn/slplink.c

ChangeLog: 

merge of '19b202a7eff53542a31f52433aa8bc17649f8b3d'
     and 'f692c258ca8f5dabfcf69ca9b2578e7bad37bdd0'