Revert "Merge branch 'master' of github.com:pcbsd/pcbsd into 9.2-release"

This reverts commit d208e87737102b2f2715d004ad16c293063b738b, reversing
changes made to 8cdae0ba667dc0682243bb31562887e8f00d58ad.

Conflicts:
	src-qt4/pc-installgui/installer.cpp
Fix the merge installer.cpp