From: David-John Willis <John.Willis@Distant-earth.com>
Date: Fri, 2 Apr 2010 10:51:49 +0000 (+0100)
Subject: Merge fixes.
X-Git-Tag: Release-2010-05/1~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7968ea692c9f98da37bd90ae6e9a12848d6aae0e;p=openembedded.git

Merge fixes.
---

diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc
index 4bed871a1f..39a3e05d08 100644
--- a/recipes/psplash/psplash.inc
+++ b/recipes/psplash/psplash.inc
@@ -9,7 +9,7 @@ RCONFLICTS_${PN} = "exquisite"
 
 SRCREV = "249"
 PV = "0.0+svnr${SRCPV}"
-PR = "r23"
+INC_PR = "r24"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND