porting work from private repo
Merge branch 'master' of github.com:dryan/decss