diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
---- xbmc-10.0.orig/configure.in 2010-12-21 23:21:08.751000004 +0100
-+++ xbmc-10.0/configure.in 2010-12-22 01:06:41.772000004 +0100
+--- xbmc-10.0.orig/configure.in 2010-12-22 20:53:28.933000073 +0100
++++ xbmc-10.0/configure.in 2010-12-22 20:53:50.418999675 +0100
@@ -919,7 +919,11 @@
# External Python
AC_SUBST(USE_PYTHON2_5)
AC_SUBST(USE_PYTHON2_4)
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in
---- xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in 2010-12-21 23:27:31.133000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in 2010-12-22 20:53:50.422999775 +0100
@@ -5,7 +5,10 @@
SHELL=/bin/bash
SYSDIR=../../../../system/python
SO=python26-$(ARCH).so
else ifeq (@USE_PYTHON2_5@,1)
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h 2010-12-21 23:55:05.712000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h 2010-12-22 20:53:50.422999775 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp 2010-12-21 23:55:05.716000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp 2010-12-22 20:53:50.423999796 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp 2010-12-21 23:55:05.718000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp 2010-12-22 20:53:50.424999804 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp 2010-12-21 23:55:05.720000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp 2010-12-22 20:53:50.424999804 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp 2010-12-21 23:55:05.720000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp 2010-12-22 20:53:50.424999804 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h 2010-12-21 23:55:05.721000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h 2010-12-22 20:53:50.425999833 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp 2010-12-21 23:55:05.722000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp 2010-12-22 20:53:50.425999833 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp 2010-12-21 23:55:05.722000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp 2010-12-22 20:53:50.426999866 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp 2010-12-21 23:55:05.724000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp 2010-12-22 20:53:50.427999896 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp 2010-12-21 23:55:05.725000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp 2010-12-22 20:53:50.427999896 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp 2010-12-21 23:55:05.726000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp 2010-12-22 20:53:50.428999923 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp 2010-12-21 23:55:05.726000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp 2010-12-22 20:53:50.428999923 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp 2010-12-21 23:55:05.727000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp 2010-12-22 20:53:50.429999947 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-21 23:55:05.727000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-22 20:53:50.429999947 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-21 23:55:05.729000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-22 20:53:50.430999968 +0100
@@ -24,7 +24,9 @@
#endif
#include "dialog.h"
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h 2010-12-21 23:55:05.729000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h 2010-12-22 20:53:50.430999968 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h 2010-12-21 23:55:05.731000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h 2010-12-22 20:53:50.431999986 +0100
@@ -26,7 +26,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h 2010-12-21 23:55:05.733000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h 2010-12-22 20:53:50.431999986 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h 2010-12-21 22:52:14.489000003 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h 2010-12-21 23:55:05.734000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h 2010-12-22 20:53:50.431999986 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-21 22:52:14.489000003 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-21 23:55:05.735000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-22 20:53:50.432999995 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp 2010-12-21 23:55:05.737000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp 2010-12-22 20:53:50.432999995 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-21 23:55:05.737000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-22 20:53:50.434000016 +0100
@@ -25,7 +25,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h 2010-12-21 23:55:05.739000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h 2010-12-22 20:53:50.434000016 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp 2010-12-21 23:55:05.740000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp 2010-12-22 20:53:50.435000034 +0100
@@ -26,7 +26,9 @@
#include "Util.h"
#include "pyplaylist.h"
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h 2010-12-21 22:52:14.489000003 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h 2010-12-21 23:55:05.740000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h 2010-12-22 20:53:50.435000034 +0100
@@ -25,7 +25,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h 2010-12-21 23:55:05.741000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h 2010-12-22 20:53:50.436000047 +0100
@@ -25,7 +25,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h 2010-12-21 23:55:05.742000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h 2010-12-22 20:53:50.436000047 +0100
@@ -25,7 +25,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h 2010-12-21 23:55:05.742000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h 2010-12-22 20:53:50.436000047 +0100
@@ -25,7 +25,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h 2010-12-21 22:52:14.489000003 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h 2010-12-21 23:55:05.745000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h 2010-12-22 20:53:50.437000062 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-21 22:52:14.489000003 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-21 23:55:05.746000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-22 20:53:50.437000062 +0100
@@ -24,7 +24,9 @@
#endif
#include "winxml.h"
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp 2010-12-21 22:52:14.489000003 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp 2010-12-21 23:55:05.746000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp 2010-12-22 20:53:50.438000084 +0100
@@ -24,7 +24,9 @@
#endif
#include "winxml.h"
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h 2010-12-21 23:55:05.747000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h 2010-12-22 20:53:50.438000084 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp 2010-12-21 23:55:05.747000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp 2010-12-22 20:55:44.030000318 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp 2010-12-22 00:09:19.572000006 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp 2010-12-22 20:53:50.439000088 +0100
@@ -23,7 +23,10 @@
#include "config.h"
#endif
#include <python2.6/structmember.h>
#elif (defined HAVE_LIBPYTHON2_5)
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2010-12-21 22:52:14.490000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2010-12-21 23:55:05.750000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2010-12-22 20:53:50.440000089 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/Python.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp xbmc-10.0/xbmc/lib/libPython/XBPython.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp 2010-12-22 00:02:48.858000005 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp 2010-12-22 20:53:50.441000086 +0100
@@ -24,7 +24,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp 2010-12-21 23:24:41.688000001 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp 2010-12-22 20:53:50.442000081 +0100
@@ -23,7 +23,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/pyconfig.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S 2010-12-21 23:26:15.465000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S 2010-12-22 20:53:50.442000081 +0100
@@ -2,7 +2,9 @@
#include "config.h"
#endif
#elif (defined HAVE_LIBPYTHON2_5)
#include <python2.5/pyconfig.h>
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp 2010-12-21 23:23:55.160000003 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp 2010-12-22 20:53:50.442000081 +0100
@@ -24,7 +24,10 @@
#include "config.h"
#endif
#include <python2.6/osdefs.h>
#elif (defined HAVE_LIBPYTHON2_5)
diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h xbmc-10.0/xbmc/lib/libPython/XBPyThread.h
---- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h 2010-12-21 22:52:14.491000004 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h 2010-12-21 23:24:02.289000004 +0100
+--- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h 2010-12-17 07:17:41.000000000 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h 2010-12-22 20:53:50.442000081 +0100
@@ -26,7 +26,9 @@
#include "config.h"
#endif