Merge branch 'maint'

diff --cc ChangeLog
index 02f7dadec850e18ca75626ed87ccc39fbf2b0660,0aaeaadf510580fba8045d610bacd4fd04ff940c..0770bc2cb71bb4eae125466c1bc49d37081f2f46
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,19 +1,24 @@@
+ 2009-05-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       testsuite: also try `jot' as `seq' replacement.
+       * tests/instmany-mans.test: Try BSD `jot' before resorting to a
+       slow but portable shell loop.
+       * tests/instmany-python.test: Likewise.
+       * tests/instmany.test: Likewise.
+       Suggestion by Peter O'Gorman.
+ 
+       Fix test failure when pkg.m4 is not found, only pkg-config.
+       * tests/vala5.test: Update comment, this test is not expected to
+       fail any more.  Require valac version 0.7.0.  Skip if configure
+       fails, could be due to unexpanded PKG_CHECK_MODULES or too old
+       valac.
+       Report by Simon Josefsson.
+ 
 +2009-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Post-release version bump.
 +      * configure.ac, NEWS: Bump version to 1.11a.
 +
  2009-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Automake 1.11.