+diff -Naur xen-3.4.2.orig/tools/misc/xsview xen-3.4.2/tools/misc/xsview
+--- xen-3.4.2.orig/tools/misc/xsview 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/misc/xsview 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ import sys
+
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/logconf.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/logconf.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/logconf.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/logconf.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test0.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test0.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test0.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test0.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test10.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test10.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test10.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test10.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test11.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test11.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test11.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test11.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test12.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test12.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test12.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test12.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test13.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test13.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test13.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test13.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test14.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test14.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test14.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test14.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test15.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test15.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test15.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test15.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test16.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test16.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test16.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test16.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test17.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test17.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test17.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test17.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test18.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test18.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test18.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test18.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test19.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test19.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test19.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test19.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test1.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test1.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test1.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test1.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test20.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test20.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test20.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test20.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test21.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test21.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test21.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test21.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test22.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test22.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test22.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test22.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test2.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test2.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test2.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test2.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test3.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test3.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test3.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test3.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test4.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test4.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test4.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test4.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test5.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test5.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test5.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test5.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test6.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test6.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test6.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test6.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test7.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test7.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test7.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test7.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test8.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test8.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test8.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test8.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test9.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test9.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test9.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test9.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test.py
+--- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test.py 2010-02-13 18:26:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
+ #
+diff -Naur xen-3.4.2.orig/tools/python/xen/util/bugtool.py xen-3.4.2/tools/python/xen/util/bugtool.py
+--- xen-3.4.2.orig/tools/python/xen/util/bugtool.py 2009-11-10 16:12:56.000000000 +0100
++++ xen-3.4.2/tools/python/xen/util/bugtool.py 2010-02-13 18:26:29.000000000 +0100