Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Thu, 10 Jan 2013 02:06:17 +0000 (03:06 +0100)
committertwinaphex <autechre1024@hotmail.com>
Thu, 10 Jan 2013 02:06:17 +0000 (03:06 +0100)

Trivial merge