merge of '68d786d826a65a1207a0d57228f667514ce0e74b'

     and '9bffa04e210205375d9a75632e31368255316a3b'

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 0f098c3..52bd88a 100644 (file)
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -42,7 +42,7 @@ BBMASK = ""
 
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
@@ -76,7 +76,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # distros, i.e. they explicitely select specific versions of various
 # packages.
 # Stay away from unversioned distros unless you really know what you are doing
-# DISTRO = "familiar-unstable"
+# DISTRO = "generic"
 
 # So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION
 # to generate binary locale packages at build time using qemu-native and