Merge our PC-BSD specific bits into the 'master' branch to get
ready for some 10-STABLE builds :)