Merge branch 'maint' into msvc

* maint:
  fix: last ChangeLog entry

diff --cc ChangeLog
index 874b557f142d6f04c02c94357df280cda3c3e785,0c37e166f696330987be15f9c6895e65eb63588a..cde6c86a0ea77969915c8af253686a8601a4d118
--- 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'.