Merge branch 'master' of git://www.sakoman.net/git/x-load-omap3