Initial commit again!
Merge branch 'cm-10.1' of https://github.com/mcgi5sr2/android_device_htc_primou into cm-10.1

Conflicts:
	cm.mk