merge with trunk. revision 11900.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 6 Mar 2008 10:19:36 +0000 (10:19 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Thu, 6 Mar 2008 10:19:36 +0000 (10:19 +0000)
commit90705a3e40b8119da262bf1da05f363bd18cd4e7
treef32cfe286601f5c86a068a92bb2868f04eb04707
parentd98a2fe1e863aba3e51e8bc6aba6ef0ffa372912
merge with trunk. revision 11900.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@11901 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/language/English/strings.xml
XBMC/system/scrapers/video/imdb tv.xml
XBMC/system/scrapers/video/imdb.xml
XBMC/xbmc/FileSystem/FileCurl.cpp
XBMC/xbmc/GUIWindowSettingsCategory.cpp