Backed out of last changeset
Merge branch 'master' of github.com:carlba/linuxconf