Merge branch '6-stable' of github.com:opscode/ohai into 6-stable

Conflicts:
	Gemfile
	ohai.gemspec