--- src/GNS3/Config/Defaults1.py	2012-09-24 13:27:02.489942551 +0200
+++ src/GNS3/Config/Defaults.py	2012-09-24 13:42:11.510069462 +0200
@@ -52,9 +52,9 @@
     if os.path.exists(qemuwrapper_path):
         QEMUWRAPPER_DEFAULT_PATH = qemuwrapper_path
     elif platform.system() == 'Linux':
-        QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/lib/gns3/qemuwrapper.py")
+        QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/libexec/gns3/qemuwrapper.py")
     else:
-        QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/local/libexec/gns3/qemuwrapper.py") # libexec is standard on BSD platforms
+        QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/libexec/gns3/qemuwrapper.py") # libexec is standard on BSD platforms
 
 # Default path to qemuwrapper working directory
 if os.environ.has_key("TEMP"):
@@ -73,19 +73,19 @@
     QEMU_IMG_DEFAULT_PATH = unicode('qemu-img')
 
 # Default path to vboxwrapper
-if sys.platform.startswith('win'):
-    VBOXWRAPPER_DEFAULT_PATH = unicode('vboxwrapper.exe')
-elif sys.platform.startswith('darwin') and hasattr(sys, "frozen"):
-    VBOXWRAPPER_DEFAULT_PATH = os.getcwdu() + os.sep + '../Resources/VBoxWrapper/Contents/MacOS/VBoxWrapper'
-else:
-    # look for vboxwrapper in the current working directory
-    vboxwrapper_path = os.getcwdu() + os.sep + 'vboxwrapper/vboxwrapper.py'
-    if os.path.exists(qemuwrapper_path):
-        VBOXWRAPPER_DEFAULT_PATH = vboxwrapper_path
-    elif platform.system() == 'Linux':
-        QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/lib/gns3/vboxwrapper.py")
-    else:
-        VBOXWRAPPER_DEFAULT_PATH = unicode("/usr/local/libexec/gns3/vboxwrapper.py") # libexec is standard on BSD platforms
+#if sys.platform.startswith('win'):
+#    VBOXWRAPPER_DEFAULT_PATH = unicode('vboxwrapper.exe')
+#elif sys.platform.startswith('darwin') and hasattr(sys, "frozen"):
+#    VBOXWRAPPER_DEFAULT_PATH = os.getcwdu() + os.sep + '../Resources/VBoxWrapper/Contents/MacOS/VBoxWrapper'
+#else:
+#    # look for vboxwrapper in the current working directory
+#    vboxwrapper_path = os.getcwdu() + os.sep + 'vboxwrapper/vboxwrapper.py'
+#    if os.path.exists(qemuwrapper_path):
+#        VBOXWRAPPER_DEFAULT_PATH = vboxwrapper_path
+#    elif platform.system() == 'Linux':
+QEMUWRAPPER_DEFAULT_PATH = unicode("/usr/libexec/gns3/qemuwrapper.py")
+#    else:
+VBOXWRAPPER_DEFAULT_PATH = unicode("/usr/libexec/gns3/vboxwrapper.py") # libexec is standard on BSD platforms
 
 # Default path to vboxwrapper working directory
 if os.environ.has_key("TEMP"):