Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Mon, 24 Dec 2012 08:24:51 +0000 (09:24 +0100)
committertwinaphex <autechre1024@hotmail.com>
Mon, 24 Dec 2012 08:24:51 +0000 (09:24 +0100)

Trivial merge