# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1257011351 0
# Node ID a78a44f0cdcdc3f4d55e13341673bc708fef786c
# Parent  7819d3819f4c5d119887fe3e03f680c68122834e# Parent  fd2afe1b2d3ca74a98265f5f12ca587f7ca478db
merge of '6a184b4a50c778257ab194f0339b91beda1f97c8'
     and 'd6d5f18ff695ad46c11336cf3301aa955b41d5bb'

diff -r 7819d3819f4c -r a78a44f0cdcd ChangeLog
diff -r 7819d3819f4c -r a78a44f0cdcd pidgin/gtkutils.c