edited
Merge branch 'master' of ssh://github.com/KB3NZQ/XBMC-TheGeekGroup into frodoRelease

* 'master' of ssh://github.com/KB3NZQ/XBMC-TheGeekGroup:
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited attributes