Autotools [gavl]
Small change in Makefile.in
Merge branch 'distrotech-gmerlin' of https://github.com/Distrotech/gmerlin into distrotech-gmerlin

Conflicts:
	gavl/Makefile.in