Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Sun, 17 Feb 2013 22:20:39 +0000 (23:20 +0100)
committertwinaphex <autechre1024@hotmail.com>
Sun, 17 Feb 2013 22:20:39 +0000 (23:20 +0100)

Trivial merge