Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Fri, 4 Jan 2013 18:03:21 +0000 (19:03 +0100)
committertwinaphex <autechre1024@hotmail.com>
Fri, 4 Jan 2013 18:03:21 +0000 (19:03 +0100)

Trivial merge