Merge branch 'master' of ssh://jbrindle@oss.tresys.com/home/git/selinux/