pidgin: f9aa1dca: merge of '4659790302e1226bf3dd9eb699c028...

Wed Jul 8 02:11:05 EDT 2009

-----------------------------------------------------------------
Revision: f9aa1dca409f04b4b4b08f8fcbc7cb1478ca4aee
Ancestor: 4659790302e1226bf3dd9eb699c028d230304638
Ancestor: 947111754d9b58f45801cb22f64596b1ed0a5a31
Author: qulogic at pidgin.im
Date: 2009-07-08T06:06:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f9aa1dca409f04b4b4b08f8fcbc7cb1478ca4aee

Modified files:
        libpurple/Makefile.am libpurple/protocols/jabber/google.c
        pidgin/gtkutils.c

ChangeLog: 

merge of '4659790302e1226bf3dd9eb699c028d230304638'
     and '947111754d9b58f45801cb22f64596b1ed0a5a31'