pre-merge.
Another attempted at hsync detection.

Conflicts:
	Makefile