From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 17 Jan 2010 11:08:50 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~447
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f2d6fb3055fd21c6fbaf12842e52ef418d2b06c;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

7f2d6fb3055fd21c6fbaf12842e52ef418d2b06c
diff --cc aclocal.m4
index 01c6b1380,d7cbc11ef..3c960a3c6
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -1,7 -1,7 +1,7 @@@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11a -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+ # 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc automake.in
index 1d1f40c8c,8692d61f8..482972b78
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in