Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Tue, 11 Dec 2012 01:54:04 +0000 (02:54 +0100)
committertwinaphex <autechre1024@hotmail.com>
Tue, 11 Dec 2012 01:54:04 +0000 (02:54 +0100)

Trivial merge