http://code.google.com/p/dolphin-emu/source/detail?r=f5a3379d712a1a71e5f196aa9d95e1deccec4c6c
I'll just leave this here. I guess that merge conflict really was too much for him.
I'll just leave this here. I guess that merge conflict really was too much for him.
