From: Matthias Hentges <oe@hentges.net>
Date: Fri, 22 Jul 2005 15:16:02 +0000 (+0000)
Subject: merge of 113e53533fd379355156720bc34edd95b0322f33
X-Git-Tag: Release-2010-05/1~9453^2~4086^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8070737c6ef3adcfc3825efff1797317140af251;p=openembedded.git

merge of 113e53533fd379355156720bc34edd95b0322f33
     and 750e11a1ae1b2f764d9f8957da4d35526d71d7a4
---

8070737c6ef3adcfc3825efff1797317140af251
diff --cc packages/initscripts/initscripts_1.0.bb
index f61f1e8128,6a37770cea..3fbbda4cf8
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@@ -6,8 -6,9 +6,8 @@@ DEPENDS = "makedevs
  DEPENDS_openzaurus = "makedevs virtual/kernel"
  RDEPENDS = "makedevs"
  LICENSE = "GPL"
- PR = "r50"
+ PR = "r48"
  
 -
  SRC_URI = "file://halt \
             file://ramdisk \
             file://umountfs \