[xbmc-main] sync
[xbmc-skins] sync