From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 31 Jul 2005 17:46:29 +0000 (+0000)
Subject: merge of 121ddca6013972dd4ad8d52c0eece2b80188cff9
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~39
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=510fbcbb4355e84fcdabb99e0c1cc4f2a49955c5;p=openembedded.git

merge of 121ddca6013972dd4ad8d52c0eece2b80188cff9
     and 214e28220f1a269af25029de6f726b7883040283
---

510fbcbb4355e84fcdabb99e0c1cc4f2a49955c5
diff --cc packages/meta/openslug-packages.bb
index ac8c0db5e5,2c2b17e717..a1e8e59b6a
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@@ -113,9 -115,7 +117,10 @@@ OPENSLUG_PACKAGES_append_linux = "
  	libpam \
  	php \
  	postfix \
 +	psmisc \
 +	screen \
 +	streamripper \
+ 	timezones \
  	xinetd \
  	yp-tools ypbind ypserv \
  	"