pidgin: caaa65e1: merge of '4b5bc8b4da1faf24168e7210c22820...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: caaa65e1c157e6cb43219237f88a4ad298f3bbf5
Ancestor: 4b5bc8b4da1faf24168e7210c2282016455a2218
Ancestor: 4de09c83277edb004b4f20c31b3016c4b2188ffa
Author: sadrul at pidgin.im
Date: 2008-04-27T01:48:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/caaa65e1c157e6cb43219237f88a4ad298f3bbf5

Modified files:
        ChangeLog autogen.sh pidgin/gtkconv.c pidgin/gtkmain.c

ChangeLog: 

merge of '4b5bc8b4da1faf24168e7210c2282016455a2218'
     and '4de09c83277edb004b4f20c31b3016c4b2188ffa'