push + merge

[Stefano Lattarini]

Pushed the following change as abvious to maint, and merged maint into
branch-1.11 and into master.

Regards,
   Stefano

-*-*-

From 926b43d4a4314a4b9eeb4241a36e35afc4fe581b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 6 Aug 2010 21:36:33 +0200
Subject: [PATCH] Typofix in ChangeLog (2010-07-18, Stefano Lattarini)

---
 ChangeLog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bac5d1..1f32e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,7 +111,7 @@
        the background automake process, but poll it every 10 seconds for
        at most 30 times (this makes the test both faster on good machines,
        and more resilient to spurious timeout-due failures when in low
-       priority or on havily-loaded systems).
+       priority or on heavily-loaded systems).
        Check also that automake writes the expected error messages on the
        standard error.
        Enable `errexit' flag, and related changes.
-- 
1.7.1