argh
Merge branch 'master' of github.com:carolanitz/VideoPanorama