Merge branch 'master' of git://github.com/jedi4ever/veewee

Conflicts:
	templates/freebsd-9.1-RELEASE-amd64/postinstall.csh
	templates/freebsd-9.1-RELEASE-amd64/postinstall.sh
	templates/freebsd-9.2-RELEASE-amd64/postinstall.csh