Merge remote-tracking branch 'xbmc/master' into pvr.wmc
Merge pvr.wmc from KrustyReturns branch.