Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Thu, 29 Nov 2012 00:40:24 +0000 (01:40 +0100)
committertwinaphex <autechre1024@hotmail.com>
Thu, 29 Nov 2012 00:40:24 +0000 (01:40 +0100)

Trivial merge