From: David Karlstrom <daka@thg.se>
Date: Sun, 21 Aug 2005 22:01:32 +0000 (+0000)
Subject: merge of 15f935ec31419a7188400fe78993271a4634488e
X-Git-Tag: Release-2010-05/1~9453^2~3849^2~5^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=591c5f29edc1a5260b78e02d6968310bdd3a75d8;p=openembedded.git

merge of 15f935ec31419a7188400fe78993271a4634488e
     and 815b2ce98833825b7001c1ea56c8e1d1885de010
---

591c5f29edc1a5260b78e02d6968310bdd3a75d8
diff --cc packages/initscripts/initscripts-1.0/banner
index 21a01d2846,21a01d2846..21a01d2846
mode 100755,100755..100644
--- a/packages/initscripts/initscripts-1.0/banner
+++ b/packages/initscripts/initscripts-1.0/banner