Merge branch 'master' of git://git.rockbox.org/rockbox