Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 1 Feb 2012 10:33:15 +0000 (11:33 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 1 Feb 2012 10:33:15 +0000 (11:33 +0100)
* maint:
  cleanup: remove unused .am file


Trivial merge