Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <autechre1024@hotmail.com>
Fri, 7 Jun 2013 19:22:31 +0000 (21:22 +0200)
committertwinaphex <autechre1024@hotmail.com>
Fri, 7 Jun 2013 19:22:31 +0000 (21:22 +0200)

Trivial merge