Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Wed, 28 Nov 2012 05:35:30 +0000 (06:35 +0100)
committertwinaphex <autechre1024@hotmail.com>
Wed, 28 Nov 2012 05:35:30 +0000 (06:35 +0100)

Trivial merge