Merge branch 'bddir'

diff --cc language/English/strings.xml
Simple merge

diff --cc project/VS2010Express/XBMC.vcxproj
Simple merge

diff --cc project/VS2010Express/XBMC.vcxproj.filters
Simple merge

diff --cc xbmc/FileItem.cpp
Simple merge

diff --cc xbmc/Util.cpp
Simple merge

diff --cc xbmc/video/windows/GUIWindowVideoBase.cpp
Simple merge