pidgin: 03c0ab28: merge of '1ea3865b477734411bc371709c1d29...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 03c0ab2851cc27d6b9e3a270c343cf3116c485ac
Ancestor: 1ea3865b477734411bc371709c1d29d4a4be04ab
Ancestor: 2ac6557a402c32c1c9cc902a500058eb824f0795
Author: sadrul at pidgin.im
Date: 2010-06-03T03:24:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/03c0ab2851cc27d6b9e3a270c343cf3116c485ac

Modified files:
        Makefile.mingw pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of '1ea3865b477734411bc371709c1d29d4a4be04ab'
     and '2ac6557a402c32c1c9cc902a500058eb824f0795'