Setup the LPTray to use the new LPWatcher class (untested yet)
Merge branch 'master' of github.com:pcbsd/pcbsd

Conflicts:
	src-qt4/life-preserver/LPWatcher.cpp