attempt at fix
Merge branch 'master' of https://github.com/codexblack/cm10.1_htc_golfu-master

Conflicts:
	golfu.mk

attempt 2