Merge branch 'holger/openmoko-merges' into org.openembedded.dev