Merge git://github.com/notaz/pcsx_rearmed
authortwinaphex <libretro@gmail.com>
Fri, 5 Apr 2013 00:56:55 +0000 (02:56 +0200)
committertwinaphex <libretro@gmail.com>
Fri, 5 Apr 2013 00:56:55 +0000 (02:56 +0200)

Trivial merge