fail when more than one collect_data blocks defined per platform
add PluginDefinitionError to Ohai, rescue in loader.rb
add exceptions to ohai/exception.rb
check for detailed warning message
fix mime-types dependency version
Merge pull request #217 from opscode/OC-10247

Fail Ohai when > 1 collect_data blocks defined per platform
Correct help output to reference ohai not chef
Detect virtualbox guests via dmidecode so guest additions aren't
required
Update Virtualbox guest test for the dmidecode detection
Merge branch 'OHAI-495'
Merge pull request #221 from tas50/OHAI-522

Correct help output to reference ohai not chef
Remove self-dependency in libvirt plugin
Fix Mac OS X stub java workaround
Merge branch 'OHAI-514'

Fixes OHAI-514, https://tickets.opscode.com/browse/OHAI-514
added comment to help someone
Merge branch 'OHAI-527'
OHAI-525 : can now detect qemu/kvm according the cpu type
[OHAI-509] fix build date parsing from php if php patched with suhosin:

$ php -v
PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30)
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies

Conflicts:
	lib/ohai/plugins/php.rb
[OHAI-358] add test for php version parse
update test with current master

test passes:
$ ruby -S rspec spec/unit/plugins/php_spec.rb

Conflicts:
	spec/unit/plugins/php_spec.rb