Merge branch 'master' into 20130421-ip-provider

Conflicts:
	sys/cddl/dev/dtrace/amd64/dtrace_isa.c
Make sure that zone_id_t is defined.
Merge branch 'master' into 20130421-ip-provider
Merge branch '20130421-ip-provider' into markj-develop