Merge https://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Mon, 23 Dec 2013 23:04:48 +0000 (00:04 +0100)
committertwinaphex <libretro@gmail.com>
Mon, 23 Dec 2013 23:04:48 +0000 (00:04 +0100)

Trivial merge