alarm/xbmc-cubox to 12.1-5
Merge pull request #465 from aldrik/xbmc-cubox

alarm/xbmc-cubox to 12.1-5