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

Conflicts:
	xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
	xbmc/cores/dvdplayer/DVDPlayer.cpp