pidgin: 7bd57cdd: merge of '4296be52d5b80da450d41464433fee...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 7bd57cddaf2dc03e0a2e8680494ef157bc0d3567
Ancestor: 4296be52d5b80da450d41464433feee7c438d8f9
Ancestor: c9200b58a3e76e0eb7e693c9262158bbad8a8afc
Author: qulogic at pidgin.im
Date: 2009-07-03T06:03:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7bd57cddaf2dc03e0a2e8680494ef157bc0d3567

Modified files:
        libpurple/protocols/jabber/google.c pidgin/gtkprefs.c

ChangeLog: 

merge of '4296be52d5b80da450d41464433feee7c438d8f9'
     and 'c9200b58a3e76e0eb7e693c9262158bbad8a8afc'