Merge branch 'maint' into yacc-work

* maint:
  fix: last ChangeLog entry

diff --cc ChangeLog
index ebc125304d8d6bb2f0ba7115ec245f7ed5e2d39c,0c37e166f696330987be15f9c6895e65eb63588a..150bef60fc39e3c6ba21b80b2b45a0426412e634
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
-       tests: drop unnecessary in 'subpkg.test'
 +2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
+ 2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: drop unnecessary requirement in 'subpkg.test'
        * tests/subpkg.test ($required): Drop "bison", it is not required
        anymore since commit `v1.11-502-g7e5ae80'.