From 679eba1067f878f9856d177c3c6ea92fdb0a415e Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 20 Mar 2002 22:45:06 +0000
Subject: [PATCH] Merge fixes from Debian bison_1.34-1.diff.

* configure.in (AC_PREREQ): 2.53.
* po/es.po ("Conflict in state %d between rule %d and token %s
resolved as %s.\n"): Fix typo by replacing "%s" with "%d'.
---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 995cc2ac..15505349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-20  Paul Eggert  <eggert@twinsun.com>
+
+	Merge fixes from Debian bison_1.34-1.diff.
+
+	* configure.in (AC_PREREQ): 2.53.
+	* po/es.po ("Conflict in state %d between rule %d and token %s
+	resolved as %s.\n"): Fix typo by replacing "%s" with "%d'.
+
 2002-03-20  Akim Demaille  <akim@epita.fr>
 
 	Version 1.34a.