Merge branch 'master' of github.com:PimentNoir/xbmc
Merge branch 'master' of github.com:PimentNoir/xbmc