Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Tue, 2 Apr 2013 01:45:35 +0000 (04:45 +0300)
committernotaz <notasas@gmail.com>
Tue, 2 Apr 2013 01:45:35 +0000 (04:45 +0300)

Trivial merge