Adding back meta-ros
Merge branch 'dev' of github.com:gumstix/Gumstix-YoctoProject-Repo into dev

Conflicts:
	default.xml