Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Thu, 25 Jul 2013 11:48:13 +0000 (13:48 +0200)
committertwinaphex <libretro@gmail.com>
Thu, 25 Jul 2013 11:48:13 +0000 (13:48 +0200)

Trivial merge