Commit ea1a4174a8328f0bbd6afa0110ac4e9dfafc1b71

Stefano Lattarini 2010-09-26T16:39:45

Merge branch 'maint' Conflicts: Makefile.am Makefile.in lib/Automake/Configure_ac.pm