im.pidgin.pidgin: 9d61f7ce04220ece6fdfa2e89e42f175cf1293c6

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 9d61f7ce04220ece6fdfa2e89e42f175cf1293c6
Ancestor: 45b552be25717e53a4c0e84b9d0242ded9c05628
Ancestor: 534c96a5976cb55b46a727cf2bee87140137b1e9
Author: sadrul at pidgin.im
Date: 2007-11-14T00:23:21
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.API finch/libgnt/gntmenu.c finch/libgnt/gntmenu.h
        finch/libgnt/gntwm.c pidgin/gtkdocklet-x11.c

ChangeLog: 

merge of '45b552be25717e53a4c0e84b9d0242ded9c05628'
     and '534c96a5976cb55b46a727cf2bee87140137b1e9'