Merge branch 'Gotham' of git://github.com/xbmc/xbmc.git into another

Conflicts:
	language/English/strings.po
	system/settings/settings.xml
	xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
	xbmc/cores/VideoRenderers/RenderFormats.h
	xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
	xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
	xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
	xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
	xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
	xbmc/settings/Settings.cpp
	xbmc/windowing/Makefile
	xbmc/windowing/WinEvents.h
	xbmc/windowing/X11/WinSystemX11.cpp
	xbmc/windowing/X11/WinSystemX11.h