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

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

diff --cc recipes/pandora-system/pandora-scripts.bb
index d6a94af,cc65f9d..fcc8b19
--- 1/recipes/pandora-system/pandora-scripts.bb
--- 2/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@@ -23,7 -22,11 +22,12 @@@ SRC_URI = " 
            file://op_switchgui.sh \
            file://op_switchgui.desktop \
            file://startnetbooklauncher \
 +          file://startmmenu \          
+           file://op_calibrate.sh \
+           file://op_calibrate.desktop \
+           file://op_datetime.sh \
+           file://op_datetime.desktop \
+           file://gui.conf \
  "
  
  do_install() {
@@@ -42,13 -46,20 +47,18 @@@
            install -m 0644 ${WORKDIR}/op_bluetooth.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_defaultgui.desktop ${D}${datadir}/applications/
            install -m 0644 ${WORKDIR}/op_switchgui.desktop ${D}${datadir}/applications/          
- 
+           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}/          
  }
  
  PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --cc recipes/pandora-system/pandora-scripts/op_bluetooth.sh
Simple merge