# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1303762385 0
# Node ID 974722699032036d14046061d07c904c728c99b9
# Parent  d1315b4e1e4a4428f6f2577726e7b2650e311f9a# Parent  a92f4cb593a4298246a395012f85709ed70b9f91
merge of 'a8f0eef7e999fe67029a8df6e8a41d9a1c564388'
     and 'fc93ce764b1029c91f84961e1b909a8d267e225e'

diff -r d1315b4e1e4a -r 974722699032 configure.ac
diff -r d1315b4e1e4a -r 974722699032 pidgin/gtkutils.c