Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Sun, 2 Dec 2012 17:06:01 +0000 (18:06 +0100)
committertwinaphex <autechre1024@hotmail.com>
Sun, 2 Dec 2012 17:06:01 +0000 (18:06 +0100)

Trivial merge