PUAE 2.6.0b6
Merge branch 'GnoStiC' commit 210b55b8d76e6818639bdb860fa1f4b128883b34

Conflicts:
	src/blkdev.c
	src/main.c
Fixed merge error
Masked GAYLE prototypes and masked call to gayle_free(). It produced a linker error if SCSIEMU is defined without using GAYLE.