Merge branch 'master' of git://git.openpandora.org/openpandora.oe

Conflicts:
	recipes/pandora-system/pandora-scripts.bb

diff --combined recipes/pandora-system/pandora-scripts.bb
index fcc8b19,657f458..5809944
--- 1/recipes/pandora-system/pandora-scripts.bb
--- 2/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@@ -6,7 -6,7 +6,7 @@@ COMPATIBLE_MACHINE = "omap3-pandora
  DEPENDS = "zenity dbus"
  RDEPENDS = "zenity dbus"
  
 -PR = "r9"
 +PR = "r10"
  
  SRC_URI = " \
            file://op_bright.sh \
@@@ -22,7 -22,7 +22,7 @@@
            file://op_switchgui.sh \
            file://op_switchgui.desktop \
            file://startnetbooklauncher \
 -          file://startmmenu \
 +          file://startmmenu \          
            file://op_calibrate.sh \
            file://op_calibrate.desktop \
            file://op_datetime.sh \
@@@ -50,15 -50,18 +50,15 @@@ do_install() 
            install -m 0644 ${WORKDIR}/op_calibrate.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_datetime.desktop ${D}${datadir}/applications/
            
 -
 -
            install -d ${D}${sysconfdir}/xdg/autostart/
            install -m 0644 ${WORKDIR}/op_bluetooth-check.desktop ${D}${sysconfdir}/xdg/autostart/op_bluetooth-check.desktop
  
 -        install -d ${D}${sysconfdir}/pandora/conf/
 +          install -d ${D}${sysconfdir}/pandora/conf/
            install -m 0644 ${WORKDIR}/gui.conf ${D}${sysconfdir}/pandora/conf/gui.conf
  
 -
            install -d ${D}${bindir}/
            install -m 0755 ${WORKDIR}/startnetbooklauncher ${D}${bindir}/
-           install -m 0755 ${WORKDIR}/startmmenu ${D}${bindir}/          
+           install -m 0755 ${WORKDIR}/startmmenu ${D}${bindir}/
  }
  
  PACKAGE_ARCH = "${MACHINE_ARCH}"