Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.


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