Merge branch 'libretro'
authornotaz <notasas@gmail.com>
Wed, 12 Sep 2012 23:17:48 +0000 (02:17 +0300)
committernotaz <notasas@gmail.com>
Wed, 12 Sep 2012 23:17:48 +0000 (02:17 +0300)

Trivial merge