Merge branch 'master' into 20130324-mfi-bbu-learning

Conflicts:
	usr.sbin/mfiutil/mfi_bbu.c
Merge branch '20130324-mfi-bbu-learning' into markj-develop