Merge branch 'maint' into branch-1.11

* maint:
  tests: fix spurious failures due to missing 'yywrap()' function
  depcomp: spelling fix
  tests: fix 'distcheck-override-infodir.test' on Cygwin

diff --cc ChangeLog
Simple merge

diff --cc lib/depcomp
index 9825d56,5621fd4..bd0ac08
--- 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-16.09; # UTC
+ scriptversion=2011-12-04.11; # 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