merge 19488 back from the 3.1 branch


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19538 a1c6a512-1295-4272-9138-f99709370657
5 files changed