Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 10 Sep 2011 22:44:12 +0000 (00:44 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 10 Sep 2011 22:44:12 +0000 (00:44 +0200)
* maint:
  tests: fix spurious failure on fast machines

1  2 
ChangeLog

diff --cc ChangeLog
Simple merge