Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Mon, 18 Mar 2013 00:16:31 +0000 (01:16 +0100)
committertwinaphex <autechre1024@hotmail.com>
Mon, 18 Mar 2013 00:16:31 +0000 (01:16 +0100)

Trivial merge