Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Mon, 17 Dec 2012 01:01:13 +0000 (02:01 +0100)
committertwinaphex <autechre1024@hotmail.com>
Mon, 17 Dec 2012 01:01:13 +0000 (02:01 +0100)

Trivial merge