Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Tue, 29 Jan 2013 00:59:01 +0000 (01:59 +0100)
committertwinaphex <autechre1024@hotmail.com>
Tue, 29 Jan 2013 00:59:01 +0000 (01:59 +0100)

Trivial merge