?
Merge branch 'master' of https://github.com/xelmirage/hugin-2012.0.0