From: David-John Willis <John.Willis@Distant-earth.com>
Date: Tue, 11 May 2010 11:28:29 +0000 (+0100)
Subject: Merge branch 'master' of git://git.openpandora.org/openpandora.oe
X-Git-Tag: Release-2010-05/1~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=2c6ee4674414649702101081de0fbd2293722388;hp=98eff3a28e3cee9f8ad334e7eda72fb1a9718e90

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

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 7f3fae4..e4f2054 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r24"
+PR = "r25"
 
 inherit task
 
@@ -106,7 +106,6 @@ PANDORA = " \
   pandora-scripts \
   pandora-wallpaper-official pandora-wallpaper-community \
   pandora-xfce-defaults \
-  pandora-xmms-defaults xmms \
   pandora-midori-defaults midori \
   libgles2d \
   pandora-misc \