pidgin: 8138501a: merge of '2e94598029dc6350d656fd335ad837...

Thu Jun 10 16:40:46 EDT 2010

-----------------------------------------------------------------
Revision: 8138501adc82bed07f319a032075157923e0cb9b
Ancestor: 2e94598029dc6350d656fd335ad83738ff0c8e29
Ancestor: 5e3707fd727a9e7f1d26a84dbf06be284072fd1f
Author: malu at pidgin.im
Date: 2010-06-10T20:35:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8138501adc82bed07f319a032075157923e0cb9b

Modified files:
        ChangeLog doc/finch.1.in finch/libgnt/gntentry.c
        libpurple/media/backend-fs2.c pidgin/gtkblist.c

ChangeLog: 

merge of '2e94598029dc6350d656fd335ad83738ff0c8e29'
     and '5e3707fd727a9e7f1d26a84dbf06be284072fd1f'