Merge branch 'master' of git://git.rockbox.org/rockbox
commit21c1d7f56f859d3bfec5e9192c5f964cac41d01e
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 10 May 2010 10:13:59 +0000 (10 12:13 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 10 May 2010 10:13:59 +0000 (10 12:13 +0200)
tree3aee4d1f88d94880a7a1bb059ccab24512140af4
parentf13ec608bb407517fb3c5b77f41596f602344856
parent06a46d75e5bc9cd54e8c85299abf0d1aaa6eef53
Merge branch 'master' of git://git.rockbox.org/rockbox