Merge branch 'Frodo' of https://github.com/xbmc/xbmc into Frodo

Conflicts:
	configure.in
	xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
	xbmc/cores/VideoRenderers/RenderFormats.h
	xbmc/cores/VideoRenderers/RenderManager.cpp
	xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
	xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h
	xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
	xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
	xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
	xbmc/linux/Makefile.in
	xbmc/utils/CPUInfo.cpp
	xbmc/windowing/X11/WinSystemX11GLES.cpp
	xbmc/windowing/egl/EGLWrapper.cpp
	xbmc/windowing/egl/Makefile