diff --git a/lib/vagrant/actions/vm/forward_ports.rb b/lib/vagrant/actions/vm/forward_ports.rb
index ff6aeee28..1e9db059f 100644
--- a/lib/vagrant/actions/vm/forward_ports.rb
+++ b/lib/vagrant/actions/vm/forward_ports.rb
@@ -36,7 +36,7 @@ module Vagrant
             # Host-only or Bridged networking don't require port-forwarding and establishing forwarded ports on these
             # attachment types has uncertain behaviour.
             if @runner.vm.network_adapters[adapter].attachment_type == :nat
-               logger.info "Forwarding \"#{name}\": #{options[:guestport]} on Adapter\##{adapter+1} => #{options[:hostport]}"
+               logger.info "Forwarding \"#{name}\": #{options[:guestport]} on adapter \##{adapter+1} => #{options[:hostport]}"
                port = VirtualBox::ForwardedPort.new
                port.name = name
                port.hostport = options[:hostport]
@@ -44,8 +44,8 @@ module Vagrant
                port.instance = adapter
                @runner.vm.forwarded_ports << port
             else
-              logger.info "VirtualBox Adapter\##{adapter+1} not configured as \"NAT\"."
-              logger.info "Skipped setting forwarding \"#{name}\": #{options[:guestport]} on Adapter\##{adapter+1} => #{options[:hostport]}"
+              logger.info "VirtualBox adapter \##{adapter+1} not configured as \"NAT\"."
+              logger.info "Skipped port forwarding \"#{name}\": #{options[:guestport]} on adapter\##{adapter+1} => #{options[:hostport]}"
             end
           end
 
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 021e01bbc..1f561b9c8 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-05-22}
+  s.date = %q{2010-05-25}
   s.default_executable = %q{vagrant}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
@@ -92,6 +92,7 @@ Gem::Specification.new do |s|
      "lib/vagrant/ssh.rb",
      "lib/vagrant/systems/base.rb",
      "lib/vagrant/systems/linux.rb",
+     "lib/vagrant/util.rb",
      "lib/vagrant/util/error_helper.rb",
      "lib/vagrant/util/glob_loader.rb",
      "lib/vagrant/util/output_helper.rb",
@@ -174,6 +175,7 @@ Gem::Specification.new do |s|
      "test/vagrant/util/stacked_proc_runner_test.rb",
      "test/vagrant/util/template_renderer_test.rb",
      "test/vagrant/util/translator_test.rb",
+     "test/vagrant/util_test.rb",
      "test/vagrant/vm_test.rb",
      "vagrant.gemspec"
   ]
@@ -183,72 +185,73 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.test_files = [
-    "test/vagrant/box_test.rb",
-     "test/vagrant/resource_logger_test.rb",
-     "test/vagrant/ssh_test.rb",
-     "test/vagrant/environment_test.rb",
-     "test/vagrant/provisioners/base_test.rb",
-     "test/vagrant/provisioners/chef_solo_test.rb",
-     "test/vagrant/provisioners/chef_server_test.rb",
-     "test/vagrant/provisioners/chef_test.rb",
-     "test/vagrant/commands/ssh_test.rb",
-     "test/vagrant/commands/destroy_test.rb",
-     "test/vagrant/commands/resume_test.rb",
-     "test/vagrant/commands/halt_test.rb",
-     "test/vagrant/commands/provision_test.rb",
-     "test/vagrant/commands/status_test.rb",
-     "test/vagrant/commands/base_test.rb",
-     "test/vagrant/commands/up_test.rb",
-     "test/vagrant/commands/reload_test.rb",
-     "test/vagrant/commands/package_test.rb",
-     "test/vagrant/commands/init_test.rb",
-     "test/vagrant/commands/ssh_config_test.rb",
-     "test/vagrant/commands/box/list_test.rb",
-     "test/vagrant/commands/box/add_test.rb",
-     "test/vagrant/commands/box/remove_test.rb",
-     "test/vagrant/commands/suspend_test.rb",
-     "test/vagrant/config_test.rb",
+    "test/test_helper.rb",
      "test/vagrant/vm_test.rb",
-     "test/vagrant/downloaders/base_test.rb",
-     "test/vagrant/downloaders/http_test.rb",
-     "test/vagrant/downloaders/file_test.rb",
      "test/vagrant/command_test.rb",
-     "test/vagrant/active_list_test.rb",
+     "test/vagrant/environment_test.rb",
+     "test/vagrant/util_test.rb",
+     "test/vagrant/box_test.rb",
      "test/vagrant/busy_test.rb",
+     "test/vagrant/provisioners/base_test.rb",
+     "test/vagrant/provisioners/chef_test.rb",
+     "test/vagrant/provisioners/chef_server_test.rb",
+     "test/vagrant/provisioners/chef_solo_test.rb",
      "test/vagrant/systems/linux_test.rb",
-     "test/vagrant/util/output_helper_test.rb",
-     "test/vagrant/util/plain_logger_test.rb",
-     "test/vagrant/util/stacked_proc_runner_test.rb",
-     "test/vagrant/util/error_helper_test.rb",
-     "test/vagrant/util/platform_test.rb",
-     "test/vagrant/util/template_renderer_test.rb",
-     "test/vagrant/util/translator_test.rb",
-     "test/vagrant/actions/vm/start_test.rb",
-     "test/vagrant/actions/vm/destroy_test.rb",
-     "test/vagrant/actions/vm/customize_test.rb",
-     "test/vagrant/actions/vm/resume_test.rb",
-     "test/vagrant/actions/vm/halt_test.rb",
-     "test/vagrant/actions/vm/provision_test.rb",
-     "test/vagrant/actions/vm/import_test.rb",
-     "test/vagrant/actions/vm/up_test.rb",
-     "test/vagrant/actions/vm/boot_test.rb",
-     "test/vagrant/actions/vm/reload_test.rb",
-     "test/vagrant/actions/vm/shared_folders_test.rb",
-     "test/vagrant/actions/vm/package_test.rb",
-     "test/vagrant/actions/vm/move_hard_drive_test.rb",
-     "test/vagrant/actions/vm/forward_ports_test.rb",
-     "test/vagrant/actions/vm/suspend_test.rb",
-     "test/vagrant/actions/vm/down_test.rb",
-     "test/vagrant/actions/vm/export_test.rb",
+     "test/vagrant/config_test.rb",
      "test/vagrant/actions/base_test.rb",
      "test/vagrant/actions/runner_test.rb",
-     "test/vagrant/actions/collection_test.rb",
-     "test/vagrant/actions/box/destroy_test.rb",
-     "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/verify_test.rb",
-     "test/vagrant/actions/box/unpackage_test.rb",
+     "test/vagrant/actions/box/destroy_test.rb",
      "test/vagrant/actions/box/add_test.rb",
-     "test/test_helper.rb"
+     "test/vagrant/actions/box/unpackage_test.rb",
+     "test/vagrant/actions/box/download_test.rb",
+     "test/vagrant/actions/collection_test.rb",
+     "test/vagrant/actions/vm/reload_test.rb",
+     "test/vagrant/actions/vm/suspend_test.rb",
+     "test/vagrant/actions/vm/boot_test.rb",
+     "test/vagrant/actions/vm/package_test.rb",
+     "test/vagrant/actions/vm/down_test.rb",
+     "test/vagrant/actions/vm/shared_folders_test.rb",
+     "test/vagrant/actions/vm/destroy_test.rb",
+     "test/vagrant/actions/vm/halt_test.rb",
+     "test/vagrant/actions/vm/import_test.rb",
+     "test/vagrant/actions/vm/customize_test.rb",
+     "test/vagrant/actions/vm/start_test.rb",
+     "test/vagrant/actions/vm/move_hard_drive_test.rb",
+     "test/vagrant/actions/vm/up_test.rb",
+     "test/vagrant/actions/vm/export_test.rb",
+     "test/vagrant/actions/vm/provision_test.rb",
+     "test/vagrant/actions/vm/resume_test.rb",
+     "test/vagrant/actions/vm/forward_ports_test.rb",
+     "test/vagrant/active_list_test.rb",
+     "test/vagrant/commands/base_test.rb",
+     "test/vagrant/commands/reload_test.rb",
+     "test/vagrant/commands/ssh_config_test.rb",
+     "test/vagrant/commands/suspend_test.rb",
+     "test/vagrant/commands/package_test.rb",
+     "test/vagrant/commands/status_test.rb",
+     "test/vagrant/commands/init_test.rb",
+     "test/vagrant/commands/destroy_test.rb",
+     "test/vagrant/commands/halt_test.rb",
+     "test/vagrant/commands/box/remove_test.rb",
+     "test/vagrant/commands/box/add_test.rb",
+     "test/vagrant/commands/box/list_test.rb",
+     "test/vagrant/commands/up_test.rb",
+     "test/vagrant/commands/provision_test.rb",
+     "test/vagrant/commands/resume_test.rb",
+     "test/vagrant/commands/ssh_test.rb",
+     "test/vagrant/resource_logger_test.rb",
+     "test/vagrant/downloaders/base_test.rb",
+     "test/vagrant/downloaders/file_test.rb",
+     "test/vagrant/downloaders/http_test.rb",
+     "test/vagrant/util/stacked_proc_runner_test.rb",
+     "test/vagrant/util/output_helper_test.rb",
+     "test/vagrant/util/template_renderer_test.rb",
+     "test/vagrant/util/translator_test.rb",
+     "test/vagrant/util/platform_test.rb",
+     "test/vagrant/util/error_helper_test.rb",
+     "test/vagrant/util/plain_logger_test.rb",
+     "test/vagrant/ssh_test.rb"
   ]
 
   if s.respond_to? :specification_version then