(maint) processorcount on solaris should return a string
Merge branch 'bugfix/facter-2/solaris-processorcount-string' into facter-2
Merge branch 'facter-2'

Conflicts:
	spec/unit/processor_spec.rb