pidgin: f6fb6097: merge of '8958bbc5a8fc6f85d0906e37b07548...

Sat Feb 20 02:13:30 EST 2010

-----------------------------------------------------------------
Revision: f6fb60976c8b5d0548af201452be83cafc7a0153
Ancestor: 8958bbc5a8fc6f85d0906e37b0754808791b4007
Ancestor: adb61741bcb6be653032843d5cd82714f4729d02
Author: qulogic at pidgin.im
Date: 2010-02-20T07:05:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f6fb60976c8b5d0548af201452be83cafc7a0153

Deleted entries:
        pidgin/gtkdocklet-x11.c
Modified files:
        libpurple/plugins/log_reader.c pidgin/Makefile.am
        pidgin/gtkdebug.c pidgin/gtkdocklet-gtk.c pidgin/gtkprefs.c
        pidgin/gtkprivacy.c pidgin/gtkrequest.c
        pidgin/gtksavedstatuses.c pidgin/gtkutils.c
        pidgin/plugins/gestures/gestures.c
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/win32/gtkwin32dep.c po/POTFILES.in

ChangeLog: 

merge of '8958bbc5a8fc6f85d0906e37b0754808791b4007'
     and 'adb61741bcb6be653032843d5cd82714f4729d02'