pidgin: cea62f7b: merge of '6df484b58e54743f46465726f124c3...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: cea62f7b47932346f03cee1e76ee19f0076147f8
Ancestor: 6df484b58e54743f46465726f124c339a884768f
Ancestor: a5baf7ca8907c15748c0a707d36aa836518b73ae
Author: sadrul at pidgin.im
Date: 2010-06-09T17:36:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cea62f7b47932346f03cee1e76ee19f0076147f8

Modified files:
        ChangeLog doc/finch.1.in finch/libgnt/gntentry.c
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of '6df484b58e54743f46465726f124c339a884768f'
     and 'a5baf7ca8907c15748c0a707d36aa836518b73ae'