Merge commit '84b251164fe461575f4c4587a6de573fb897f0ba' into oemaster-waitfornet-and-mysql

Conflicts:
	xbmc/powermanagement/PowerManager.cpp