From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 9 Jan 2006 19:21:24 +0000 (+0000)
Subject: explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86d1d8cd13335c4dca722ac398c69a105fc9ac8f;p=openembedded.git

explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
              and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

86d1d8cd13335c4dca722ac398c69a105fc9ac8f
diff --cc conf/distro/slugos.conf
index cab425a25f,afeba5bd56..8eb0b01aa8
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@@ -170,7 -170,7 +170,7 @@@ PREFERRED_VERSION_ixp400-eth ?= "1.5
  
  # Select the smallest provider of x11 libraries
  PREFERRED_PROVIDER_x11 ?= "diet-x11"
- CVSDATE_diet-x11 ?= "20060106"
 -SRCDATE_diet-x11 ?= "20051005"
++SRCDATE_diet-x11 ?= "20060106"
  
  # Ensure consistency across all SlugOS builds for the provider of a
  # relational database - use the latest version of the SleepyCat
diff --cc conf/machine/nslu2.conf
index 1f70d9923b,a28591dc57..8c4e253407
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@@ -141,10 -141,12 +141,10 @@@ USE_VT = "0
  #-------------------------------------------------------------------------------
  # Package versions
  #-------------------------------------------------------------------------------
- CVSDATE_ipkg-utils ?= "20060106"
- CVSDATE_ipkg-utils-native ?= "20060106"
- CVSDATE_ipkg-link ?= "20060106"
- CVSDATE_irssi ?= "20050930"
 -SRCDATE_gnu-config ?= "20050713"
 -SRCDATE_gnu-config-native ?= "20050713"
 -SRCDATE_ipkg-utils ?= "20050713"
 -SRCDATE_ipkg-utils-native ?= "20050713"
 -SRCDATE_ipkg-link ?= "20050713"
++SRCDATE_ipkg-utils ?= "20060106"
++SRCDATE_ipkg-utils-native ?= "20060106"
++SRCDATE_ipkg-link ?= "20060106"
+ SRCDATE_irssi ?= "20050930"
  
  CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
  INHERIT += "nslu2-mirrors"