Merge branch 'cm-10.1' of github.com:CyanogenMod/android_device_samsung_d2spr into HEAD

Conflicts:
	cm.mk
	system.prop