Commit 94ad7e48dc63321ca334e71c0f87dc3eada8ffd6

Stefano Lattarini 2011-10-17T17:46:05

Merge branch 'aclocal-path' into maint