[pvr-addons] current master
Merge branch 'master-dev' into master-dev-tegra2

* master-dev:
  [pvr-addons] current master