Sync with CVS HEAD.
Sync with CVS HEAD.

NewEraCracker/pfsense,BlackstarGroup/pfsense,NewEraCracker/pfsense,NewEraCracker/pfsense,brunostein/pfsense,dennypage/pfsense,NOYB/pfsense,ptorsten/pfsense,dennypage/pfsense,pfsense/pfsense,phil-davis/pfsense,phil-davis/pfsense,ptorsten/pfsense,jxmx/pfsense,ch1c4um/pfsense,NOYB/pfsense,NewEraCracker/pfsense,ptorsten/pfsense,BlackstarGroup/pfsense,phil-davis/pfsense,ch1c4um/pfsense,dennypage/pfsense,dennypage/pfsense,pfsense/pfsense,NOYB/pfsense,jxmx/pfsense,phil-davis/pfsense,BlackstarGroup/pfsense,jxmx/pfsense,pfsense/pfsense,ch1c4um/pfsense,brunostein/pfsense,pfsense/pfsense,ch1c4um/pfsense,brunostein/pfsense,BlackstarGroup/pfsense