Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Sat, 9 Feb 2013 09:05:21 +0000 (10:05 +0100)
committertwinaphex <autechre1024@hotmail.com>
Sat, 9 Feb 2013 09:05:21 +0000 (10:05 +0100)

Trivial merge