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

Conflicts:
	recipes/tasks/task-pandora-core.bb

diff --combined recipes/tasks/task-pandora-core.bb
index f0c3ff0,da2482b..f24a7b1
--- 1/recipes/tasks/task-pandora-core.bb
--- 2/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@@ -5,7 -5,7 +5,7 @@@ DESCRIPTION = "Task file for default co
  
  # Don't forget to bump the PR if you change it.
  
- PR = "r27"
+ PR = "r34"
  
  inherit task 
  
@@@ -48,13 -48,13 +48,13 @@@ MEDIA_LIBS = " 
    faad2 \
    mikmod \
    speex \  
 -  flac \ 
 +  flac \
    audiofile \
  "
  OPENGLES = " \
    omap3-sgx-modules devmem2 \
    libgles-omap3 \
-   libgles-omap3-rawdemos \
+ #  libgles-omap3-rawdemos \
  "
  
  PAM = " \
@@@ -66,7 -66,7 +66,7 @@@ PANDORA_LIBS = " 
    pandora-libpnd lsof \
    omap3-deviceid \
    pandora-skel \
-   pandora-lcd-state \
+   pandora-state \
  "
  
  SUDO = " \
@@@ -99,9 -99,6 +99,9 @@@ EXTRA_TOOLS = " 
    file \
    socat \
    strace \
 +  screen \
 +  rsync \
 +  unrar \
    ksymoops \
    kexec-tools \
    zip \        
@@@ -113,6 -110,7 +113,7 @@@
    gdb \
    sessreg \
    lua5.1 \
+   tzdata \
  "
  
  # Add extra util-linux-ng utils to image. 
@@@ -142,6 -140,8 +143,8 @@@ RDEPENDS_${PN} = "
    ${UTIL_LINUX_NG_EXTRAS} \
  #        packagekit \
    python-pygame \
+   python-misc \
+   python-modules \
    alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \
    rdesktop \
    \