Merge branch 'tests-misc-fixes-1'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 7 Nov 2010 10:50:06 +0000 (11:50 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 7 Nov 2010 10:50:06 +0000 (11:50 +0100)
commit1e460312d79fe15170e7519fb785e132ac7293fb
tree0ae596dbd16c0612ef52eb9f56179e6956b8cf67
parent4555c818e5ae6a90a8116e9c5b5b1ff6a65929c0
parent657ba885946a20a43dd556f45b8583c5bc016ebe
Merge branch 'tests-misc-fixes-1'

Conflicts:
tests/Makefile.am
tests/Makefile.in
ChangeLog
tests/Makefile.am
tests/Makefile.in