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

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

diff --cc 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
@@@ -53,12 -53,15 +53,12 @@@ do_install() 
            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}"