hmm

Conflicts:
	kernel_manifest.xml