Merge branch 'vuplus_experimental' into vuplus_experimental_gst10

diff --combined configure.ac
index a235a0c,94654cd..a2075c8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -30,12 -30,7 +30,12 @@@ TUXBOX_APPS_DV
  AM_CONDITIONAL(HAVE_GIT_DIR, test -d "$srcdir/.git")
  AM_CONDITIONAL(HAVE_FAKE_GIT_DIR, test -f "$srcdir/.git/last_commit_info")
  
 -PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-0.10 gstreamer-pbutils-0.10 libdvbsi++ libpng libxml-2.0 sigc++-1.2 libssl libcrypto])
 +dnl versions of gstreamer and plugins-base
 +AC_ARG_WITH(gstversion,
 +        AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
 +        [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
 +
 +PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR libdvbsi++ libpng libxml-2.0 sigc++-1.2 libssl libcrypto])
  PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_LIBDDVD="yes", HAVE_LIBDDVD="no")
  AM_CONDITIONAL(HAVE_LIBDDVD, test "$HAVE_LIBDDVD" = "yes")
  
@@@ -198,8 -193,6 +198,6 @@@ lib/python/Plugins/Extensions/WebBrowse
  lib/python/Plugins/Extensions/WebBrowser/meta/Makefile
  lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile
  lib/python/Plugins/Extensions/WebBrowser/desc/Makefile
- lib/python/Plugins/Extensions/VuplusEvent/Makefile
- lib/python/Plugins/Extensions/VuplusEvent/meta/Makefile
  lib/python/Plugins/Extensions/StreamTV/Makefile
  lib/python/Plugins/Extensions/StreamTV/meta/Makefile
  lib/python/Plugins/Extensions/StreamTV/icons/Makefile