Merge branches 'fix-pr11302-opensuse' and 'fix-pr11306-macosx'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 25 Apr 2012 11:11:08 +0000 (13:11 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 25 Apr 2012 11:11:08 +0000 (13:11 +0200)
* fix-pr11302-opensuse:
  tests: cater to systems installing libs in /lib64

* fix-pr11306-macosx:
  tests: fix spurious failure on Mac OS X


Trivial merge