Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 5 Aug 2012 09:03:40 +0000 (11:03 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 5 Aug 2012 09:03:40 +0000 (11:03 +0200)
* maint:
  tests: cater to OpenSolaris 'zip'


Trivial merge