Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Mon, 1 Apr 2013 18:05:36 +0000 (21:05 +0300)
committernotaz <notasas@gmail.com>
Mon, 1 Apr 2013 18:05:36 +0000 (21:05 +0300)

Trivial merge