Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Mon, 11 Nov 2013 12:04:47 +0000 (13:04 +0100)
committertwinaphex <libretro@gmail.com>
Mon, 11 Nov 2013 12:04:47 +0000 (13:04 +0100)

Trivial merge