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
Merge branch 'OHAI-358'
OHAI-529: ip_scopes prefers ethernet to ppp

On hosts with virtual interfaces on RFC1918 networks, the ip_scopes
plugin may set `node.privateaddress` to a virtual address. This can
cause problems with automation that relies on the `privateaddress`
attribute.

This patch prefers non-ppp interfaces when setting `privateaddress`,
though it will use ppp interfaces if they are the only ones.
OHAI-529 sort interfaces in ip_scopes before assigning privateaddress

Hash keys are ordered in Ruby > 1.9, so the plugin behaved differently
between 1.8 and newer versions. In order to make the code (and tests)
more deterministic, let's sort network interfaces before doing work.
OHAI-529 Remove ipaddr_extension from Gemfile

Specs for the ip_scopes plugin can be run in two ways:
* Run rspec in the context of `bundle exec`
* Install ipaddr_extensions, then run rspec outside of
  `bundle exec`
OHAI-529 ensure virtual IPs are never chosen for privateaddress

- Refactor privateaddress logic into smaller, more clear
  methods based on comments from @btm
- Make rspec descriptions a little more readable