Merge branch 'libretro' into upstream
authornotaz <notasas@gmail.com>
Sat, 20 Dec 2014 19:29:36 +0000 (21:29 +0200)
committernotaz <notasas@gmail.com>
Sat, 20 Dec 2014 19:29:36 +0000 (21:29 +0200)
Syncs upstream and libretro trees, leaving out NEON_PC change.


Trivial merge