Merge branch 'master' of github.com:rapid7/metasploit-framework

msfgui

@@ -8,17 +8,21 @@
 # $Revision$
 #
 
+msfbase = __FILE__
+while File.symlink?(msfbase)
+	msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
+end
+
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
+require 'fastlib'
+require 'msfenv'
+
 begin
 	require 'msgpack'
 rescue LoadError
 	raise LoadError, "Missing msgpack gem, try 'gem install msgpack' to use MSFGui"
 end
 
-msfbase = __FILE__
-while File.symlink?(msfbase)
-	msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
-end
-
 if RUBY_PLATFORM =~ /mswin|mingw/i
 	exec "javaw -jar #{File.dirname(msfbase)}/data/gui/msfgui.jar"
 else