fixes 1
merge from old repo
	modified:   BoardConfig.mk
	modified:   device.mk
	modified:   fstab.m4
	modified:   init.m4.rc
	modified:   system.prop

Conflicts:
	device.mk

	modified:   BoardConfig.mk
	modified:   device.mk
	modified:   fstab.m4
	modified:   init.m4.rc