Merge branch 'master' into markj-kernel-config
Fix ident for my kernel config.
Consolidate DTrace hooks.
Invoke the amd64 and i386 trap handlers before calling trap().