Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Wed, 3 Apr 2013 00:12:29 +0000 (03:12 +0300)
committernotaz <notasas@gmail.com>
Wed, 3 Apr 2013 00:12:29 +0000 (03:12 +0300)

Trivial merge