Merge branch 'subdir-objects-pr10697' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Jun 2012 19:27:12 +0000 (21:27 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 11 Jun 2012 19:27:12 +0000 (21:27 +0200)
* subdir-objects-pr10697:
  maintcheck: fix failures, both real and spurious


Trivial merge