Merge branch 'master' into markj-kernel-config
Merge branch 'markj-kernel-config' into 20130624-sdt-module-info

Conflicts:
	sys/sys/param.h
Merge branch '20130624-sdt-module-info' into markj-develop

Conflicts:
	sys/sys/param.h