# HG changeset patch
# User Robert Schuster <robertschuster@fsfe.org>
# Date 1242652803 -7200
# Node ID 89b733da1bbea45be9584d7e4819f6f55f0d51e8
# Parent  b7d03f4db639d1371552480de77d053e94218807# Parent  4829edfaa376e7ffb4e88325be918b9dd0be524e
 * branch merge

diff -r b7d03f4db639 -r 89b733da1bbe ChangeLog
diff -r b7d03f4db639 -r 89b733da1bbe Makefile.am
diff -r b7d03f4db639 -r 89b733da1bbe configure.ac