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

Trivial merge