Merge branch 'pandora-27-omap1' into rev2