Merge branch 'omap1-part2' into omap1