Merge branch 'master' into testsuite-work

* master:
  tests: fix spurious failure of extradep.test on FreeBSD

diff --cc ChangeLog
index 514143258eee0c88fceb6d5cb7db68373ab4448c,0bca20795fb460b62721c1e2ab6b5a9326e1080d..7859a4e5bcbef7738cff055ff6181586424e9836
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,14 @@@
++2011-05-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
++
++      tests: fix spurious failure of extradep.test on FreeBSD
++      * tests/extradep.test: When using `ls -t' to determine whether a
++      file has been updated, make sure to use as reference a file whose
++      timestamp is expected to be *strictly* older that that of the file
++      being checked.  This is required because at least FreeBSD `ls' do
++      not sort files with the same timestamp in alphabetical order when
++      using the `-t' option.
++      * tests/extradep2.test: Likewise.
++
  2011-05-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix spurious failure of txinfo21.test on FreeBSD