Merge branch 'master' into gsoc2-audiobuf-accesses
commit307183445f6f93e252f8ccfa587a5e6a8a988f6d
authorThomas Martitz <kugel@rockbox.org>
Wed, 3 Aug 2011 10:40:53 +0000 (3 12:40 +0200)
committerThomas Martitz <kugel@rockbox.org>
Wed, 3 Aug 2011 10:40:53 +0000 (3 12:40 +0200)
tree77f62c8dc6087b0d1311f669e8d57a488a1c3d23
parentbc1a34ca86e4d81731d7ca269904d25579aaf2ee
parent3bd6ee9d6c2249ba069370290859c849457bfadb
Merge branch 'master' into gsoc2-audiobuf-accesses