Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc NEWS
Simple merge

diff --cc lib/depcomp
index 43bd0f9,e996e5d..53bee03
--- 1/lib/depcomp
--- 2/lib/depcomp
+++ b/lib/depcomp
@@@ -1,10 -1,10 +1,10 @@@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
- scriptversion=2011-04-09-11; # UTC
+ scriptversion=2011-04-11-05; # UTC
  
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011,
 -# Free Software Foundation, Inc.
 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 +# 2011 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge