Merge branch 'master' of https://code.google.com/p/dolphin-emu into DX9-Final Conflicts: Source/Core/VideoCommon/Src/MainBase.cpp Source/Core/VideoCommon/Src/RenderBase.cpp
