From: David-John Willis <John.Willis@Distant-earth.com>
Date: Wed, 29 Sep 2010 12:07:54 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: sz_beta3~235
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=6abe5a959df73b97c99c6318420e11013e273344;hp=9383e95abcee2ac08a998c6fbe17bb945bf1c732

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

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

diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index da2482b..f24a7b1 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -48,7 +48,7 @@ MEDIA_LIBS = " \
   faad2 \
   mikmod \
   speex \  
-  flac \ 
+  flac \
   audiofile \
 "
 OPENGLES = " \
@@ -99,6 +99,9 @@ EXTRA_TOOLS = " \
   file \
   socat \
   strace \
+  screen \
+  rsync \
+  unrar \
   ksymoops \
   kexec-tools \
   zip \