Fixes for XBMC.
Merge branch 'master' of github.com:dezi/raspi