From: David-John Willis <John.Willis@Distant-earth.com>
Date: Thu, 8 Apr 2010 07:09:17 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: Release-2010-05/1~65^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ebb54e2f3460c30bd3bb4802bc4b2a5b94a9220;p=openpandora.oe.git

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

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

1ebb54e2f3460c30bd3bb4802bc4b2a5b94a9220
diff --cc recipes/pandora-system/pandora-scripts.bb
index fcc8b19,657f458..5809944
--- a/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}"