Merge remote branch 'upstream/master'

diff --cc configure.in
Simple merge

diff --cc xbmc/addons/AddonManager.cpp
index 94a0bb8,983a478..a02af33
--- 1/xbmc/addons/AddonManager.cpp
--- 2/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@@ -38,14 -38,8 +38,12 @@@
  #include "Visualisation.h"
  #endif
  #ifdef HAS_SCREENSAVER
- #include "DllScreenSaver.h"
  #include "ScreenSaver.h"
  #endif
 +#ifdef HAS_PVRCLIENTS
 +#include "DllPVRClient.h"
 +#include "PVRClient.h"
 +#endif
  //#ifdef HAS_SCRAPERS
  #include "Scraper.h"
  //#endif