Michael Bearne 8b6d63ab58 Merge remote branch 'remotes/upstream/master'
Refactored redhat distribution to fit new model

Conflicts:
	lib/vagrant/systems/linux.rb
	templates/debian_network_entry.erb
	templates/locales/en.yml
	templates/network_entry.erb
	templates/network_entry_debian.erb
2011-01-10 14:21:52 +00:00
..
2010-09-22 09:43:30 -06:00
2011-01-05 16:45:05 -08:00
2010-09-27 12:21:34 -07:00