Temp check-in.
Merge branch 'master' of github.com:dezi/raspi
Check in.
Merge branch 'master' of github.com:dezi/raspi

Conflicts:
	Makefile.ffmpeg-cross