From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 25 Nov 2010 21:49:56 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~491
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acb5a214c900cbe1bdfcbb59c063db741856e6eb;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'
---

acb5a214c900cbe1bdfcbb59c063db741856e6eb
diff --cc tests/Makefile.am
index 9ee15778d,dab04e393..b26796149
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -714,10 -632,8 +714,9 @@@ silent.test 
  silent2.test \
  silent3.test \
  silent4.test \
- silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
  silent9.test \
  silentcxx.test \
  silentf77.test \
diff --cc tests/Makefile.in
index 0990f2f81,de21f4334..ce9634a34
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -976,10 -899,8 +976,9 @@@ silent.test 
  silent2.test \
  silent3.test \
  silent4.test \
- silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
  silent9.test \
  silentcxx.test \
  silentf77.test \