Merge branch 'master' into gsoc2-audiobuf-accesses
commit1b25bf0d323dc9b9237613ec712a1fe1175f66fc
authorThomas Martitz <kugel@rockbox.org>
Fri, 29 Jul 2011 13:31:05 +0000 (29 15:31 +0200)
committerThomas Martitz <kugel@rockbox.org>
Fri, 29 Jul 2011 13:31:05 +0000 (29 15:31 +0200)
treefe5b48459e0e14a9c200eb319ed28b04949aba85
parente219cd64d2d9373903d2ec1a40e3c581c8ce73d5
parent5b9ec622fb9dc68e912d6dbb7a1ee17e9edeb050
Merge branch 'master' into gsoc2-audiobuf-accesses
apps/playlist.c
apps/playlist_viewer.c