Merge branch 'pr9768-fix' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 22 Dec 2011 18:20:46 +0000 (19:20 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 22 Dec 2011 18:20:46 +0000 (19:20 +0100)
commit4c6598062ee2f7e78da86ea6332cfd3847ac221e
tree182f257c76ab2840107488d1d3ff8fa899877c78
parentd3e03785dcf45cd002b8671e8024ffb6444bb384
parent9f7864ba9b8a12761db67c16025c45ed95aca47e
Merge branch 'pr9768-fix' into maint

* pr9768-fix:
  include: avoid "deleted .am file" problem
ChangeLog