This merges the last commits I made on my laptop last weekq, and I
forgot to push.  Thanks greg for testing wrsw_vlans and thus finding
I miseed some bits.

Conflicts:
	userspace/tools/wrsw_vlans.c