merge from cm-10.1
Merge branch 'aosp-jb-mr1' of github.com:kbc-developers/sc06d_boot_ramdisk into aosp-jb-mr1

Conflicts:
	init.target.rc