merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'

     and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'

614 files changed, 25876 insertions, 12142 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 53c4380116..dc59ea204c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -146,6 +146,7 @@ Recipes:    ttf-fonts/*
 
 Person:     Matthias 'CoreDump' Hentges
 Website:    http://www.hentges.net
+Distros:    Sonkei
 Machines:   collie, spitz
 Recipes:    altboot, webcam-server
 
@@ -197,7 +198,7 @@ Person:	    Rolf 'Laibsch' Leggewie
 Mail:       OE-recipes@rolf.leggewie.biz
 Website:    http://oz.leggewie.org
 Interests:  Japanese on the Zaurus
-Distros:    Ångström
+Distros:    Sonkei
 Machines:   collie, spitz
 Recipes:    anthy, nunome, uim*, granule, qpobox*, qte-font-unifont*
 Recipes:    qpf-unismall, qpobox, poboxserver, imkit*, scim, zten
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 06a49814d2..2b508a8e84 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -315,7 +315,9 @@ oe_libinstall() {
 			# stop libtool using the final directory name for libraries
 			# in staging:
 			__runcmd rm -f $destpath/$libname.la
-			__runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
+			__runcmd sed -e 's/^installed=yes$/installed=no/' \
+				     -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+				     $dotlai >$destpath/$libname.la
 		else
 			__runcmd install -m 0644 $dotlai $destpath/$libname.la
 		fi
@@ -508,6 +510,13 @@ base_do_fetchall() {
 	:
 }
 
+addtask buildall after do_build
+do_buildall[recrdeptask] = "do_build"
+base_do_buildall() {
+	:
+}
+
+
 def oe_unpack_file(file, data, url = None):
 	import bb, os
 	if not url:
@@ -695,7 +704,7 @@ do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DI
 addtask populate_staging after do_install
 
 python do_populate_staging () {
-	bb.build.exec_func('do_stage', d)
+    bb.build.exec_func('do_stage', d)
 }
 
 addtask install after do_compile
@@ -737,7 +746,7 @@ def explode_deps(s):
 
 def packaged(pkg, d):
 	import os, bb
-	return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
+	return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK)
 
 def read_pkgdatafile(fn):
 	pkgdata = {}
@@ -761,16 +770,23 @@ def read_pkgdatafile(fn):
 
 	return pkgdata
 
+def get_subpkgedata_fn(pkg, d):
+	import bb, os
+	archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
+	archs.reverse()
+	for arch in archs:
+		fn = bb.data.expand('${STAGING_DIR}/pkgdata/' + arch + '${TARGET_VENDOR}-${TARGET_OS}/runtime/%s' % pkg, d)
+		if os.path.exists(fn):
+			return fn
+	return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
+
 def has_subpkgdata(pkg, d):
 	import bb, os
-	fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
-	return os.access(fn, os.R_OK)
+	return os.access(get_subpkgedata_fn(pkg, d), os.R_OK)
 
 def read_subpkgdata(pkg, d):
 	import bb, os
-	fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
-	return read_pkgdatafile(fn)
-
+	return read_pkgdatafile(get_subpkgedata_fn(pkg, d))
 
 def has_pkgdata(pn, d):
 	import bb, os
@@ -832,6 +848,12 @@ def base_after_parse(d):
     bb.data.delVarFlag('MACHINE', 'export', d)
     bb.data.setVarFlag('MACHINE', 'unexport', 1, d)
     
+    # Make sure TARGET_ARCH isn't exported
+    # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this 
+    # in them, undocumented)
+    bb.data.delVarFlag('TARGET_ARCH', 'export', d)
+    bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d)
+    
     # Make sure DISTRO isn't exported
     # (breaks sysvinit at least)
     bb.data.delVarFlag('DISTRO', 'export', d)
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 6e5480a2a0..89cb3e9569 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -20,6 +20,8 @@ CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
 
+TOOLCHAIN_OPTIONS = ""
+
 # Overrides for paths
 
 # Path prefixes
diff --git a/classes/debian.bbclass b/classes/debian.bbclass
index a38f10d629..dd0789adae 100644
--- a/classes/debian.bbclass
+++ b/classes/debian.bbclass
@@ -1,5 +1,3 @@
-STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian"
-
 # Debian package renaming only occurs when a package is built
 # We therefore have to make sure we build all runtime packages
 # before building the current package to make the packages runtime
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index 8af10a0c8a..18aee09a26 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -13,13 +13,15 @@ distutils_do_compile() {
 }
 
 distutils_stage_headers() {
+        install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         oefatal "python setup.py install_headers execution failed."
 }
 
 distutils_stage_all() {
-        install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+        install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
+        # is this missing a lib below?
         PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
@@ -49,7 +51,7 @@ distutils_do_install() {
             done
         fi
 
-	rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
+        rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
 }
 
 EXPORT_FUNCTIONS do_compile do_install
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 312307c831..ca9c9458e1 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -125,6 +125,17 @@ insert_feed_uris () {
 		# insert new feed-sources
 		echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
 	done			
+
+	# Allow to use package deploy directory contents as quick devel-testing
+	# feed. This creates individual feed configs for each arch subdir of those
+	# specified as compatible for the current machine.
+	# NOTE: Development-helper feature, NOT a full-fledged feed.
+	if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
+	    for arch in ${PACKAGE_ARCHS}
+	    do
+		echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf
+	    done
+	fi
 }
 
 log_check() {
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 5976f42c71..c00d0f3f58 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -349,6 +349,9 @@ python populate_packages_prepend () {
 		# If autoloading is requested, output /etc/modutils/<name> and append
 		# appropriate modprobe commands to the postinst
 		autoload = bb.data.getVar('module_autoload_%s' % basename, d, 1)
+		if not autoload:
+		    # Also, try canonical name with dashes
+		    autoload = bb.data.getVar('module_autoload_%s' % basename.replace('_', '-'), d, 1)
 		if autoload:
 			name = '%s/etc/modutils/%s' % (dvar, basename)
 			f = open(name, 'w')
@@ -400,7 +403,7 @@ python populate_packages_prepend () {
 	metapkg = "kernel-modules"
 	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
 	bb.data.setVar('FILES_' + metapkg, "", d)
-	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base' ]
+	blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ]
 	for l in module_deps.values():
 		for i in l:
 			pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1))
diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass
index 33caa54b21..8be1fa762f 100644
--- a/classes/nslu2-image.bbclass
+++ b/classes/nslu2-image.bbclass
@@ -19,5 +19,5 @@ nslu2_pack_image () {
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
 }
 
-EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
+EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe apex-nslu2 apex-nslu2-16mb'
 IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 6c61f7bdda..ec8c3d97e2 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -34,9 +34,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 		return
 
 	packages = bb.data.getVar('PACKAGES', d, 1).split()
-	if not packages:
-		# nothing to do
-		return
 
 	if postinst:
 		postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -152,6 +149,12 @@ def runstrip(file, d):
         bb.debug(1, "runstrip: skip %s" % file)
         return 0
 
+    # If the file is in a .debug directory it was already stripped,
+    # don't do it again...
+    if os.path.dirname(file).endswith(".debug"):
+        bb.note("Already run strip")
+        return 0
+
     strip = bb.data.getVar("STRIP", d, 1)
     objcopy = bb.data.getVar("OBJCOPY", d, 1)
 
@@ -189,42 +192,15 @@ def runstrip(file, d):
 # Package data handling routines
 #
 
-STAGING_PKGMAPS_DIR ?= "${STAGING_DIR}/pkgmaps"
-
-def add_package_mapping (pkg, new_name, d):
-	import bb, os
-
-	def encode(str):
-		import codecs
-		c = codecs.getencoder("string_escape")
-		return c(str)[0]
-
-	pmap_dir = bb.data.getVar('STAGING_PKGMAPS_DIR', d, 1)
-
-	bb.mkdirhier(pmap_dir)
-
-	data_file = os.path.join(pmap_dir, pkg)
-
-	f = open(data_file, 'w')
-	f.write("%s\n" % encode(new_name))
-	f.close()
-
 def get_package_mapping (pkg, d):
 	import bb, os
 
-	def decode(str):
-		import codecs
-		c = codecs.getdecoder("string_escape")
-		return c(str)[0]
+	data = read_subpkgdata(pkg, d)
+	key = "PKG_%s" % pkg
 
-	data_file = bb.data.expand("${STAGING_PKGMAPS_DIR}/%s" % pkg, d)
+	if key in data:
+		return data[key]
 
-	if os.access(data_file, os.R_OK):
-		f = file(data_file, 'r')
-		lines = f.readlines()
-		f.close()
-		for l in lines:
-			return decode(l).strip()
 	return pkg
 
 def runtime_mapping_rename (varname, d):
@@ -258,9 +234,6 @@ python package_do_split_locales() {
 		return
 
 	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
-	if not packages:
-		bb.debug(1, "no packages to build; not splitting locales")
-		return
 
 	datadir = bb.data.getVar('datadir', d, 1)
 	if not datadir:
@@ -410,9 +383,6 @@ python populate_packages () {
 	bb.mkdirhier(dvar)
 
 	packages = bb.data.getVar('PACKAGES', d, 1)
-	if not packages:
-		bb.debug(1, "PACKAGES not defined, nothing to package")
-		return
 
 	pn = bb.data.getVar('PN', d, 1)
 	if not pn:
@@ -516,8 +486,6 @@ python populate_packages () {
 		pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
 		if pkgname is None:
 			bb.data.setVar('PKG_%s' % pkg, pkg, d)
-		else:
-			add_package_mapping(pkg, pkgname, d)
 
 	dangling_links = {}
 	pkg_files = {}
@@ -604,6 +572,8 @@ python emit_pkgdata() {
 		sf.close()
 
 		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
+		if not allow_empty:
+			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
 		root = "%s/install/%s" % (workdir, pkg)
 		os.chdir(root)
 		g = glob('*')
@@ -730,6 +700,16 @@ python package_do_shlibs() {
 				for l in lines:
 					shlib_provider[l.rstrip()] = (dep_pkg, lib_ver)
 
+	assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1)
+	if assumed_libs:
+	    for e in assumed_libs.split():
+		l, dep_pkg = e.split(":")
+		lib_ver = None
+		dep_pkg = dep_pkg.rsplit("_", 1)
+		if len(dep_pkg) == 2:
+		    lib_ver = dep_pkg[1]
+		dep_pkg = dep_pkg[0]
+		shlib_provider[l] = (dep_pkg, lib_ver)
 
 	for pkg in packages.split():
 		bb.debug(2, "calculating shlib requirements for %s" % pkg)
@@ -903,10 +883,7 @@ python package_depchains() {
 	prefixes  = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split()
 
 	def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
-		def packaged(pkg, d):
-			return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
-
-                #bb.note('rdepends for %s is %s' % (base, rdepends))
+        #bb.note('rdepends for %s is %s' % (base, rdepends))
 
 		rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "")
 
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index a12899e2a1..087bbcbfb4 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -32,7 +32,7 @@ python package_ipk_install () {
 
 	# Generate ipk.conf if it or the stamp doesnt exist
 	conffile = os.path.join(stagingdir,"ipkg.conf")
-	if not  os.access(conffile, os.R_OK):
+	if not os.access(conffile, os.R_OK):
 		ipkg_archs = bb.data.getVar('PACKAGE_ARCHS',d)
 		if ipkg_archs is None:
 			bb.error("PACKAGE_ARCHS missing")
@@ -114,7 +114,7 @@ package_generate_ipkg_conf () {
 }
 
 python do_package_ipk () {
-	import sys, re, fcntl, copy
+	import sys, re, copy, fcntl
 
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
@@ -127,10 +127,6 @@ python do_package_ipk () {
 		bb.error("DEPLOY_DIR_IPK not defined, unable to package")
 		return
 
-	arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
-	outdir = "%s/%s" % (outdir, arch)
-	bb.mkdirhier(outdir)
-
 	dvar = bb.data.getVar('D', d, 1)
 	if not dvar:
 		bb.error("D not defined, unable to package")
@@ -160,9 +156,11 @@ python do_package_ipk () {
 		fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
 		lf.close
 
+
 	for pkg in packages.split():
 		localdata = bb.data.createCopy(d)
-		root = "%s/install/%s" % (workdir, pkg)
+		pkgdest = bb.data.getVar('PKGDEST', d, 1)
+		root = "%s/%s" % (pkgdest, pkg)
 
 		lf = lockfile(root + ".lock")
 
@@ -181,7 +179,8 @@ python do_package_ipk () {
 
 		bb.data.update_data(localdata)
 		basedir = os.path.join(os.path.dirname(root))
-		pkgoutdir = outdir
+		arch = bb.data.getVar('PACKAGE_ARCH', localdata, 1)
+		pkgoutdir = "%s/%s" % (outdir, arch)
 		bb.mkdirhier(pkgoutdir)
 		os.chdir(root)
 		from glob import glob
@@ -202,6 +201,7 @@ python do_package_ipk () {
 		try:
 			ctrlfile = file(os.path.join(controldir, 'control'), 'w')
 		except OSError:
+			unlockfile(lf)
 			raise bb.build.FuncFailed("unable to open control file for writing.")
 
 		fields = []
@@ -235,6 +235,7 @@ python do_package_ipk () {
 		except KeyError:
 			(type, value, traceback) = sys.exc_info()
 			ctrlfile.close()
+			unlockfile(lf)
 			raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value)
 		# more fields
 
@@ -271,6 +272,7 @@ python do_package_ipk () {
 			try:
 				scriptfile = file(os.path.join(controldir, script), 'w')
 			except OSError:
+				unlockfile(lf)
 				raise bb.build.FuncFailed("unable to open %s script file for writing." % script)
 			scriptfile.write(scriptvar)
 			scriptfile.close()
@@ -281,6 +283,7 @@ python do_package_ipk () {
 			try:
 				conffiles = file(os.path.join(controldir, 'conffiles'), 'w')
 			except OSError:
+				unlockfile(lf)
 				raise bb.build.FuncFailed("unable to open conffiles for writing.")
 			for f in conffiles_str.split():
 				conffiles.write('%s\n' % f)
@@ -290,6 +293,7 @@ python do_package_ipk () {
 		ret = os.system("PATH=\"%s\" %s %s %s" % (bb.data.getVar("PATH", localdata, 1), 
                                                           bb.data.getVar("IPKGBUILDCMD",d,1), pkg, pkgoutdir))
 		if ret != 0:
+			unlockfile(lf)
 			raise bb.build.FuncFailed("ipkg-build execution failed")
 
 		for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
@@ -308,7 +312,10 @@ python do_package_ipk () {
 python () {
     import bb
     if bb.data.getVar('PACKAGES', d, True) != '':
-        bb.data.setVarFlag('do_package_write_ipk', 'depends', 'ipkg-utils-native:do_populate_staging fakeroot-native:do_populate_staging', d)
+        deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
+        deps.append('ipkg-utils-native:do_populate_staging')
+        deps.append('fakeroot-native:do_populate_staging')
+        bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
 }
 
 python do_package_write_ipk () {
@@ -316,4 +323,5 @@ python do_package_write_ipk () {
 	bb.build.exec_func("do_package_ipk", d)
 }
 do_package_write_ipk[dirs] = "${D}"
+do_package_write_ipk[depends] = "ipkg-utils-native:do_populate_staging"
 addtask package_write_ipk before do_package_write after do_package
diff --git a/classes/packaged-staging2.bbclass b/classes/packaged-staging2.bbclass
new file mode 100644
index 0000000000..29ce72d65c
--- /dev/null
+++ b/classes/packaged-staging2.bbclass
@@ -0,0 +1,229 @@
+#
+# Populate builds using prebuilt packages where possible to speed up builds
+# and allow staging to be reconstructed.
+#
+# To use it add that line to conf/local.conf:
+#
+# INHERIT = "packaged-staging"
+
+python () {
+    import bb
+    if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('image', d) and not bb.data.inherits_class('cross', d) and not bb.data.inherits_class('sdk', d):
+        deps = bb.data.getVarFlag('do_populate_staging', 'depends', d) or ""
+        deps += " stagemanager-native:do_populate_staging"
+        bb.data.setVarFlag('do_populate_staging', 'depends', deps, d)
+
+        deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or ""
+        deps += " ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+        bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d)
+    else:
+        bb.data.setVar("PSTAGING_DISABLED", "1", d)
+}
+
+export PSTAGING_DISABLED = "0"
+
+DEPLOY_DIR_PSTAGE 	= "${DEPLOY_DIR}/pstage" 
+
+PSTAGE_BUILD_CMD        = "${IPKGBUILDCMD}"
+PSTAGE_INSTALL_CMD      = "ipkg-cl install -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_UPDATE_CMD	= "ipkg-cl update -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_REMOVE_CMD       = "ipkg-cl remove -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_LIST_CMD		= "ipkg-cl list_installed -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_PKGNAME 		= "staging-${PN}_${PV}-${PR}_${MULTIMACH_ARCH}.ipk"
+
+PSTAGE_TMPDIR_STAGE     = "${WORKDIR}/staging-pkg"
+
+do_clean_append() {
+        """
+        Clear the build and temp directories
+        """
+	bb.note("Uninstalling package from staging...")
+        path = bb.data.getVar("PATH", d, 1)
+	removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
+	removepkg = bb.data.expand("staging-${PN}", d)
+        ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg))
+        if ret != 0:
+            bb.note("Failure removing staging package")
+
+        stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d)
+        bb.note("Removing staging package %s" % stagepkg)
+        #os.system('rm -rf ' + stagepkg)
+}
+
+staging_helper () {
+	#assemble appropriate ipkg.conf
+	conffile=${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf
+	mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists
+	if [ ! -e $conffile ]; then
+		ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
+		priority=1
+		for arch in $ipkgarchs; do
+			echo "arch $arch $priority" >> $conffile
+			priority=$(expr $priority + 5)
+		done
+		echo "src oe-staging file:${DEPLOY_DIR_PSTAGE}" >> $conffile
+
+		OLD_PWD=`pwd`
+		cd ${DEPLOY_DIR_PSTAGE}
+		ipkg-make-index -p Packages . 
+		cd ${OLD_PWD}
+
+		${PSTAGE_UPDATE_CMD}
+	fi
+}
+
+python do_prepackaged_stage () {
+    import os
+
+    if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1":
+        bb.build.make_stamp("do_prepackaged_stage", d)
+        return
+
+    bb.note("Uninstalling any existing package from staging...")
+    path = bb.data.getVar("PATH", d, 1)
+    removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
+    removepkg = bb.data.expand("staging-${PN}", d)
+    lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+    ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg))
+    bb.utils.unlockfile(lf)
+    if ret != 0:
+        bb.note("Failure attempting to remove staging package")
+
+    stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d)
+
+    if os.path.exists(stagepkg):
+        bb.note("Following speedup\n")
+        path = bb.data.getVar("PATH", d, 1)
+        installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1)
+
+        bb.build.exec_func("staging_helper", d)
+
+        bb.debug(1, "Staging stuff already packaged, using that instead")
+        lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+        ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg))
+        bb.utils.unlockfile(lf)
+        if ret != 0:
+            bb.note("Failure installing prestage package")
+
+        bb.build.make_stamp("do_prepackaged_stage", d)
+        bb.build.make_stamp("do_fetch", d)
+        bb.build.make_stamp("do_unpack", d)
+        bb.build.make_stamp("do_munge", d)
+        bb.build.make_stamp("do_patch", d)
+        bb.build.make_stamp("do_configure", d)
+        bb.build.make_stamp("do_qa_configure", d)
+        bb.build.make_stamp("do_rig_locales", d)
+        bb.build.make_stamp("do_compile", d)
+        bb.build.make_stamp("do_install", d)
+        bb.build.make_stamp("do_deploy", d)
+        bb.build.make_stamp("do_package", d)
+        bb.build.make_stamp("do_populate_staging", d)
+        bb.build.make_stamp("do_package_write_deb", d)
+        bb.build.make_stamp("do_package_write_ipk", d)
+        bb.build.make_stamp("do_package_write", d)
+        bb.build.make_stamp("do_package_stage", d)
+        bb.build.make_stamp("do_qa_staging", d)
+
+    else:
+        bb.build.make_stamp("do_prepackaged_stage", d)
+}
+do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}"
+do_prepackaged_stage[selfstamp] = "1"
+addtask prepackaged_stage before do_fetch
+
+populate_staging_preamble () {
+	if [ "$PSTAGING_DISABLED" != "1" ]; then
+		#mkdir -p ${DEPLOY_DIR_PSTAGE}
+
+		stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u
+		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u
+	fi
+}
+
+populate_staging_postamble () {
+	if [ "$PSTAGING_DISABLED" != "1" ]; then
+		# list the packages currently installed in staging
+		${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list         
+
+		set +e
+		stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging
+		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross
+		set -e
+	fi
+}
+
+do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
+do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
+python do_populate_staging_prepend() {
+    bb.build.exec_func("populate_staging_preamble", d)
+}
+
+python do_populate_staging_append() {
+    bb.build.exec_func("populate_staging_postamble", d)
+}
+
+
+staging_packager () {
+
+	mkdir -p ${PSTAGE_TMPDIR_STAGE}/CONTROL
+
+	echo "Package: staging-${PN}"           >  ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Version: ${PV}-${PR}"             >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Description: ${DESCRIPTION}"      >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Section: ${SECTION}"              >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Priority: Optional"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Maintainer: ${MAINTAINER}"        >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Architecture: ${MULTIMACH_ARCH}"    >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+	echo "Source: ${SRC_URI}"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+
+        ${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}
+	${PSTAGE_INSTALL_CMD} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}
+}
+
+python do_package_stage () {
+    if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1":
+        return
+
+    bb.build.exec_func("read_subpackage_metadata", d)
+    packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+    if len(packages) > 0:
+        stagepath = bb.data.getVar("PSTAGE_TMPDIR_STAGE", d, 1)
+        if bb.data.inherits_class('package_ipk', d):
+            ipkpath = os.path.join(stagepath, "deploy", "ipk")
+            bb.mkdirhier(ipkpath)
+        if bb.data.inherits_class('package_deb', d):
+            debpath = os.path.join(stagepath, "deploy", "deb")
+            bb.mkdirhier(debpath)
+
+        for pkg in packages:
+            pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
+            if not pkgname:
+                pkgname = pkg
+            arch = bb.data.getVar('PACKAGE_ARCH_%s' % pkg, d, 1)
+            if not arch:
+                arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
+            if not packaged(pkg, d):
+                continue
+            if bb.data.inherits_class('package_ipk', d):
+                srcname = bb.data.expand(pkgname + "_${PV}-${PR}_" + arch + ".ipk", d)
+                srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d)
+                if not os.path.exists(srcfile):
+                    bb.fatal("Package %s does not exist yet it should" % srcfile)
+                bb.copyfile(srcfile, ipkpath + "/" + srcname)
+            if bb.data.inherits_class('package_deb', d):
+                if arch == 'all':
+                    srcname = bb.data.expand(pkgname + "_${PV}-${PR}_all.deb", d)
+                else:
+                    srcname = bb.data.expand(pkgname + "_${PV}-${PR}_${DPKG_ARCH}.deb", d)
+                srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d)
+                if not os.path.exists(srcfile):
+                    bb.fatal("Package %s does not exist yet it should" % srcfile)
+                bb.copyfile(srcfile, debpath + "/" + srcname)
+    bb.build.exec_func("staging_helper", d)
+    lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+    bb.build.exec_func("staging_packager", d)
+    bb.utils.unlockfile(lf)
+}
+
+addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build
+
diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index c50e0b484f..d2176d8b39 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d):
 
 do_install_append () {
         for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
-                sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc}
+                sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' -e 's:${STAGING_DIR_TARGET}:${prefix}:g' ${pc}
         done
 }
 
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 935ef6e3f7..853ea225fc 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -10,8 +10,12 @@ fakeroot rootfs_deb_do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
 
+	mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
+
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
+	> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
+	> ${STAGING_ETCDIR_NATIVE}/apt/preferences
 	> ${IMAGE_ROOTFS}/var/dpkg/status
 	> ${IMAGE_ROOTFS}/var/dpkg/available
 	# > ${STAGING_DIR}/var/dpkg/status
@@ -36,9 +40,9 @@ fakeroot rootfs_deb_do_rootfs () {
 		priority=$(expr $priority + 5)
 	done
 
-	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
+	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
 
-	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
+	cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
 		| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
 		> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 479abce7fa..cc413b7011 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -70,8 +70,9 @@ def check_sanity(e):
 	if "diffstat-native" not in assume_provided:
 		messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
 	
-	# Check that the MACHINE is valid
-	if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+	# Check that the MACHINE is valid, if it is set
+	if data.getVar('MACHINE', e.data, True):
+	    if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
 		messages = messages + 'Please set a valid MACHINE in your local.conf\n'
 	
 	# Check that the DISTRO is valid
diff --git a/classes/scons.bbclass b/classes/scons.bbclass
index 534b3bd4c7..6d0a783dc2 100644
--- a/classes/scons.bbclass
+++ b/classes/scons.bbclass
@@ -6,6 +6,7 @@ scons_do_compile() {
 }
 
 scons_do_install() {
+	install -d ${D}${prefix}
         ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
         oefatal "scons install execution failed."
 }
diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index a258fda629..ae186bd04a 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -1,8 +1,10 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
 #
-DEPENDS  =+ "sip-native"
-RDEPENDS += "python-sip"
+
+# yes, python-sip is actually a build-time dependency, since
+# the recipe installs sip.h
+DEPENDS += "sip-native python-sip"
 
 # default stuff, do not uncomment
 # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
@@ -34,8 +36,8 @@ sip_do_generate() {
 	for module in $MODULES
 	do
 		install -d ${module}/
-		echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
-		sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
+		echo "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
+		sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
 			sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
 		cat ${module}/${module}.sbf 	| sed s,target,TARGET, \
 						| sed s,sources,SOURCES, \
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index c41a3ff369..a3b67b5798 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -25,6 +25,7 @@ def get_siteinfo_list(d):
                "armeb-linux-gnueabi":     "endian-big bit-32 common-glibc arm-common armeb-linux",\
                "armeb-linux-uclibc":      "endian-big bit-32 common-uclibc arm-common",\
                "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
+               "arm-darwin":              "endian-little bit-32 common-darwin",\
                "arm-linux":               "endian-little bit-32 common-glibc arm-common",\
                "arm-linux-gnueabi":       "endian-little bit-32 common-glibc arm-common arm-linux",\
                "arm-linux-uclibc":        "endian-little bit-32 common-uclibc arm-common",\
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
index 390d3684d4..bbc9f187ec 100644
--- a/classes/sourcepkg.bbclass
+++ b/classes/sourcepkg.bbclass
@@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
 addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after archive_bb before do_create_diff_gz
+addtask dumpdata after do_archive_bb before do_create_diff_gz
 addtask create_diff_gz after do_dump_data before do_configure
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9d5d54bfb8..ac2d281123 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -82,7 +82,7 @@ HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
 HOST_PREFIX = "${TARGET_PREFIX}"
 HOST_CC_ARCH = "${TARGET_CC_ARCH}"
 
-TARGET_ARCH = "INVALID"
+TARGET_ARCH ?= "INVALID"
 TARGET_OS = "INVALID"
 TARGET_VENDOR = "${BUILD_VENDOR}"
 TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
@@ -311,12 +311,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi
 ##################################################################
 
 CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+TOOLCHAIN_OPTIONS = ""
 
-export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
-export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
-export CPP = "${HOST_PREFIX}gcc -E"
-export LD = "${HOST_PREFIX}ld"
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}"
+export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}"
 export CCLD = "${CC}"
 export AR = "${HOST_PREFIX}ar"
 export AS = "${HOST_PREFIX}as"
@@ -587,6 +588,7 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
diff --git a/conf/checksums.ini b/conf/checksums.ini
index afa2a95e2b..76eacce219 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e
 md5=b67ef657b83ca26249d7b9e9c5e7da69
 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
 
+[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2]
+md5=391f85b4f962269e044ceac2b5235310
+sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
+
 [http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
 md5=3bdf4da35ff576a401483815952f4045
 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 345da5698c..f36ae8c6fe 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -2,13 +2,13 @@
 #@TYPE: Distribution
 #@NAME: Angstrom <http://www.angstrom-distribution.org>
 #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
+#@MAINTAINER: Koen Kooi <koen@openembedded.org>
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2007.9"
-DISTRO_VERSION = "2007.9-test-${DATE}"
-DISTRO_REVISION = "46"
+# The release will the 2007.12
+DISTRO_VERSION = "2007.11RC2.1"
+DISTRO_REVISION = "51"
 
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
@@ -29,18 +29,24 @@ DISTRO_TYPE ?= "debug"
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
-FEED_URIS += " \
-		no-arch##${ANGSTROM_URI}/unstable/feed/all \
-		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
+# These will be put under package management soon
+#FEED_URIS += " \
+#		no-arch##${ANGSTROM_URI}/unstable/feed/all \
+#		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
+#		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
+#		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
+#		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
+#		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
+#		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
 #        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
 
+
+# set feed path variables
+FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
+
+
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
 CVS_TARBALL_STASH ?= "\
 		     http://www.angstrom-distribution.org/unstable/sources/ \
@@ -54,7 +60,8 @@ MACHINE_KERNEL_VERSION = "2.6"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh20"
+PREFERRED_VERSION_linux-ixp4xx                      ?= "2.6.21.6+svnr${SRCREV}"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
@@ -98,6 +105,16 @@ PREFERRED_VERSION_binutils          ?= "2.18"
 PREFERRED_VERSION_binutils-cross    ?= "2.18"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
 
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
+PREFERRED_VERSION_avr32-gcc               = "4.1.2"
+PREFERRED_VERSION_avr32-gcc-cross         = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.0.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
+
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
@@ -108,6 +125,10 @@ PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"
 PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
+
 PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
@@ -127,6 +148,7 @@ require conf/distro/include/preferred-e-versions.inc
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -156,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
@@ -214,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral \
+    ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
@@ -228,3 +251,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     avahi-autoipd \
     openssh-sftp-server \
     "
+
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 58225bb8ec..85b2916a44 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -2,7 +2,7 @@
 #@TYPE: Distribution
 #@NAME: Angstrom <http://www.angstrom-distribution.org>
 #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
-#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
+#@MAINTAINER: Koen Kooi <koen@openembedded.org>
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
 #@--------------------------------------------------------------------
 
@@ -35,14 +35,10 @@ DISTRO_TYPE ?= "debug"
 # Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
-FEED_URIS += " \
-		no-arch##${ANGSTROM_URI}/unstable/feed/all \
-		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
+
+# set feed path variables
+FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
+
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
 CVS_TARBALL_STASH ?= "\
@@ -57,7 +53,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
@@ -70,19 +66,6 @@ PREFERRED_VERSION_uclibc ?= "0.9.29"
 PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
 
-#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE
-PREFERRED_VERSION_binutils_avr32 = "2.17"
-PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
-PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
-#there's is no avr32 patch for 0.9.29
-PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
-PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
-PREFERRED_VERSION_gcc_avr32               ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross_avr32         ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross-sdk_avr32     ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross-initial_avr32 ?= "4.2.1"
-
-
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
@@ -110,8 +93,20 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_VERSION_gcc_avr32               = "4.1.2"
+PREFERRED_VERSION_gcc-cross_avr32         = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2"
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -141,6 +136,7 @@ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
@@ -189,7 +185,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral \
+    ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${DEBUG_APPS} \
     "
@@ -202,3 +198,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     avahi-autoipd \
     openssh-sftp-server \
     "
+
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf
index b77b3e9c87..26e78f89c1 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/generic-uclibc.conf
@@ -21,5 +21,9 @@ DISTRO_NAME = "generic-uClibC"
 TARGET_OS = "linux-uclibc"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
 PREFERRED_PROVIDER_virtual/libintl = "libintl"
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 7ab7818393..0286666495 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -56,9 +56,7 @@ TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_PROVIDER_virtual/libc = "glibc"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index e4b083dd86..1b6ed46ac7 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
-PREFERRED_VERSION_bluez-cups-backend ?= "3.22"
+PREFERRED_VERSION_bluez-cups-backend ?= "3.23"
 PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
 PREFERRED_VERSION_bluez-gnome ?= "0.14"
-PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22"
+PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23"
 PREFERRED_VERSION_bluez-hcidump ?= "1.38"
-PREFERRED_VERSION_bluez-libs ?= "3.22"
-PREFERRED_VERSION_bluez-utils ?= "3.22"
-PREFERRED_VERSION_bluez-utils-alsa ?= "3.22"
+PREFERRED_VERSION_bluez-libs ?= "3.23"
+PREFERRED_VERSION_bluez-utils ?= "3.23"
+PREFERRED_VERSION_bluez-utils-alsa ?= "3.23"
 PREFERRED_VERSION_bmon ?= "2.1.0"
 PREFERRED_VERSION_boa ?= "0.94.13"
 PREFERRED_VERSION_bochs ?= "2.1"
@@ -776,7 +776,7 @@ PREFERRED_VERSION_keymap-locales ?= "1.0"
 PREFERRED_VERSION_keymaps ?= "1.0"
 PREFERRED_VERSION_keyring ?= "0.6.8"
 PREFERRED_VERSION_kf ?= "0.5.4.1"
-PREFERRED_VERSION_kismet ?= "2007-01-R1b"
+PREFERRED_VERSION_kismet ?= "2007-10-R1"
 PREFERRED_VERSION_klibc ?= "1.1.1"
 PREFERRED_VERSION_klimt ?= "0.6.1"
 PREFERRED_VERSION_knights ?= "1.14"
@@ -838,7 +838,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42"
 PREFERRED_VERSION_libcontactsdb ?= "0.5"
 PREFERRED_VERSION_libcroco ?= "0.6.1"
 PREFERRED_VERSION_libcwd ?= "0.99.47"
-PREFERRED_VERSION_libdaemon ?= "0.11"
+PREFERRED_VERSION_libdaemon ?= "0.12"
 PREFERRED_VERSION_libdata-optlist-perl ?= "0.101"
 PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101"
 PREFERRED_VERSION_libdbi ?= "0.7.2"
@@ -995,7 +995,7 @@ PREFERRED_VERSION_libpcl ?= "1.4"
 PREFERRED_VERSION_libpcre ?= "4.4"
 PREFERRED_VERSION_libpcre-native ?= "4.4"
 PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
-PREFERRED_VERSION_libpixman ?= "0.1.6"
+PREFERRED_VERSION_libpixman ?= "0.9.6"
 PREFERRED_VERSION_libpng ?= "1.2.20"
 PREFERRED_VERSION_libpng-native ?= "1.2.20"
 PREFERRED_VERSION_libpthread-stubs ?= "0.1"
@@ -1074,7 +1074,7 @@ PREFERRED_VERSION_libwindowswm ?= "1.0.0"
 PREFERRED_VERSION_libwnck ?= "2.13.5"
 PREFERRED_VERSION_libwpd ?= "0.8.6"
 PREFERRED_VERSION_libx11 ?= "1.1.3"
-PREFERRED_VERSION_libx11-native ?= "1.0.1"
+PREFERRED_VERSION_libx11-native = "1.0.3"
 PREFERRED_VERSION_libxau ?= "1.0.3"
 PREFERRED_VERSION_libxau-native ?= "1.0.3"
 PREFERRED_VERSION_libxaw ?= "1.0.4"
@@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.10"
+PREFERRED_VERSION_midori ?= "0.0.13"
 PREFERRED_VERSION_midpath ?= "0.1"
 PREFERRED_VERSION_midpath-alsa ?= "0.1"
 PREFERRED_VERSION_midpath-cldc ?= "0.1"
@@ -1274,6 +1274,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
 PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
 PREFERRED_VERSION_mono-native ?= "1.2.5.1"
 PREFERRED_VERSION_monotone-4 ?= "0.19"
 PREFERRED_VERSION_monotone-5 ?= "0.25.2"
@@ -1352,7 +1353,7 @@ PREFERRED_VERSION_obby ?= "0.4.1"
 PREFERRED_VERSION_obexftp ?= "0.20"
 PREFERRED_VERSION_obexpush ?= "1.0.0"
 PREFERRED_VERSION_obexpush-native ?= "1.0.0"
-PREFERRED_VERSION_octave ?= "2.9.14"
+PREFERRED_VERSION_octave ?= "2.1.73"
 PREFERRED_VERSION_offlineimap ?= "4.0.14"
 PREFERRED_VERSION_olsr ?= "0.3-1"
 PREFERRED_VERSION_olsrd ?= "0.5.3"
@@ -1438,7 +1439,7 @@ PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"
 PREFERRED_VERSION_pivotinit ?= "1.0.0"
-PREFERRED_VERSION_pixman ?= "0.9.5"
+PREFERRED_VERSION_pixman ?= "0.9.6"
 PREFERRED_VERSION_pixops-test ?= "1.0"
 PREFERRED_VERSION_pkgconfig ?= "0.22"
 PREFERRED_VERSION_pkgconfig-native ?= "0.22"
@@ -1890,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
 PREFERRED_VERSION_u2nl ?= "1.3"
 PREFERRED_VERSION_uae4all ?= "0.7.1"
 PREFERRED_VERSION_ubahnnav ?= "0.4.1"
-PREFERRED_VERSION_uboot-utils ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
 PREFERRED_VERSION_udev ?= "092"
 PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
 PREFERRED_VERSION_udhcp ?= "0.9.8"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 6726710aa9..837aec9f2d 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -5,14 +5,12 @@ PREFERRED_PROVIDER_virtual/libc = "eglibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial"
 
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "eglibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "eglibc-intermediate"
-
-
+PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc    = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc  = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc            = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc        = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc         = "eglibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc          = "eglibc-intermediate"
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 16a914c0a3..11cee727c5 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
 #qemu doesn't like armv6/eabi/vfp
 ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
 ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"
@@ -255,7 +258,7 @@ TINDER_REPORT     = "1"
 # seppuku bbclass
 SEPPUKU_LOGIN        = "http://bugs.openembedded.org/query.cgi?"
 SEPPUKU_QUERY        = "http://bugs.openembedded.org/buglist.cgi?"
-SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_ATTACHMENT   = "http://bugs.openembedded.org/attachment.cgi?"
 SEPPUKU_AUTOBUILD    = "1"
@@ -268,5 +271,4 @@ SEPPUKU_COMPONENT    = "build"
 
 
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
-DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci"
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index 7c675087ab..e039a144d3 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -62,6 +62,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-session ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 0e29c19c5c..74b930781b 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -10,56 +10,33 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
@@ -72,4 +49,3 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
 SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index ccd458da89..b3b47093b7 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20070819"
+EFL_SRCDATE = "20071206"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -89,6 +89,7 @@ SRCDATE_python-evas ?= "${EFL_SRCDATE}"
 SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
 SRCDATE_python-edje ?= "${EFL_SRCDATE}"
 SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
+SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
 SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
 SRCDATE_python-etk ?= "${EFL_SRCDATE}"
 
@@ -102,12 +103,16 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}"
 SRCDATE_expedite ?= "${EFL_SRCDATE}"
 SRCDATE_elitaire ?= "${EFL_SRCDATE}"
 SRCDATE_entice ?= "${EFL_SRCDATE}"
+SRCDATE_entrance ?= "${EFL_SRCDATE}"
 SRCDATE_e-utils ?= "${EFL_SRCDATE}"
+SRCDATE_e-wm ?= "${EFL_SRCDATE}"
 SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_exquisite ?= "${EFL_SRCDATE}"
 
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
+SRCDATE_python-pydirectfb = "20071210"
 SRCDATE_dvbstream ?= "20060814"
 SRCDATE_dvbtraffic ?= "20060814"
 SRCDATE_dvbtune ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8fee94e9d9..5446a425ce 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,7 +14,7 @@ SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
-SRCREV_pn-eds-dbus ?= "628"
+SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-eglibc ?= "4355"
 SRCREV_pn-eglibc-initial ?= "4355"
 SRCREV_pn-eglibc-intermediate ?= "4355"
@@ -31,13 +31,13 @@ SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "3519"
+SRCREV_pn-libgsmd ?= "3684"
 SRCREV_pn-libgsmd-devel ?= "3293"
-SRCREV_pn-libjana ?= "697"
-SRCREV_pn-libmokogsmd2 ?= "3378"
+SRCREV_pn-libjana ?= "700"
+SRCREV_pn-libmokogsmd2 ?= "3663"
 SRCREV_pn-libmokojournal2 ?= "3217"
 SRCREV_pn-libmokopanelui2 ?= "3349"
-SRCREV_pn-libmokoui2 ?= "3229"
+SRCREV_pn-libmokoui2 ?= "3688"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
@@ -62,18 +62,18 @@ SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "3249"
+SRCREV_pn-openmoko-browser2 ?= "3646"
 SRCREV_pn-openmoko-calculator ?= "2404"
-SRCREV_pn-openmoko-calculator2 ?= "3235"
+SRCREV_pn-openmoko-calculator2 ?= "3655"
 SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "3259"
 SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "374"
+SRCREV_pn-openmoko-contacts2 ?= "387"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "661"
+SRCREV_pn-openmoko-dates2 ?= "673"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3522"
-SRCREV_pn-openmoko-feedreader2 ?= "3080"
+SRCREV_pn-openmoko-dialer2 ?= "3689"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
@@ -82,33 +82,35 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3345"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3583"
 SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3477"
+SRCREV_pn-openmoko-messages2 ?= "3712"
 SRCREV_pn-openmoko-panel-battery ?= "3360"
 SRCREV_pn-openmoko-panel-bt ?= "3149"
 SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "3256"
+SRCREV_pn-openmoko-panel-gsm ?= "3664"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
+SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
+SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192"
 SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "348"
-SRCREV_pn-openmoko-terminal2 ?= "3435"
+SRCREV_pn-openmoko-tasks2 ?= "361"
+SRCREV_pn-openmoko-terminal2 ?= "3542"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
 SRCREV_pn-openmoko-theme-standard2 ?= "3425"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3478"
+SRCREV_pn-openmoko-today2 ?= "3609"
 SRCREV_pn-openmoko-today2-folders ?= "3414"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
@@ -120,9 +122,9 @@ SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-webkit-gtk ?= "27222"
-SRCREV_pn-webkit-qt ?= "27222"
-SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-webkit-gtk ?= "28656"
+SRCREV_pn-webkit-qt ?= "28656"
+SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 0d7c4773b7..ab80719646 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -101,6 +101,12 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc       = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc     = "glibc-intermediate"
 
+# Set the preferred provider for a few toolchain-related items, otherwise
+# these may be selected from the external-toolchain instead.
+PREFERRED_PROVIDER_virtual/arm-linux-binutils       = "binutils-cross"
+PREFERRED_PROVIDER_virtual/armeb-linux-binutils     = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers               = "linux-libc-headers"
+
 # compiler/binary/library versions
 PREFERRED_VERSION_binutils           ?= "2.18"
 PREFERRED_VERSION_binutils-cross     ?= "2.18"
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
new file mode 100644
index 0000000000..fc760f9ea0
--- /dev/null
+++ b/conf/distro/openwrt-sdk.conf
@@ -0,0 +1,26 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenWRT-SDK
+#@DESCRIPTION: Building packages for OpenWRT using its official SDK.
+#
+#@COMMENT: This allows to build packages only, not the whole images.
+#@COMMENT: You should install and have in path an SDK from the www.openwrt.org.
+#@COMMENT: SDK installers are both host and target specific (so look in download
+#@COMMENT: dir for your target). If there is no SDK for your host arch,
+#@COMMENT: you can also look at downloads of x-wrt.org, a sister project.
+#@COMMENT: To build a package, use command like:
+#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package>
+#-----------------------------------------------------------------------------
+
+require conf/distro/generic-uclibc.conf
+
+#
+# Header
+#
+DISTRO_NAME = "OpenWRT"
+
+# This is what lives in SDK
+ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+
+# Make sure that we have correct package dependencies for SDK-provided libs.
+ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index ad75fffe11..0cf5e8e81e 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -45,7 +45,9 @@ 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"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross"
 PREFERRED_PROVIDERS += " virtual/libc:glibc"
+PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers"
 
 PREFERRED_PROVIDER_libc6-unslung = "glibc"
 
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 44a174a01b..6c71bc00c7 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -34,6 +34,11 @@ TARGET_CC_ARCH[doc] = "FIXME"
 TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \
 for hardware floating point instructions."
 
+ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\
+ These packages won't be built by bitbake."
+ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\
+ for which automatic shlib dependency tracking doesn't work."
+
 PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
@@ -98,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot
 
 SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
 
+FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
+FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image."
+
 # insane bbclass
 QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
 
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index 0dda9492e9..b119a24359 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
-				kernel-module-nls-iso8859-1 \
-				kernel-module-nls-utf8 \
-				kernel-module-af-key \
+MACHINE_EXTRA_RRECOMMENDS = "\
 				kernel-module-i2c-pxa"
 
 #
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf
index 2522897042..1b6188753e 100644
--- a/conf/machine/cm-x270.conf
+++ b/conf/machine/cm-x270.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.23"
+PREFERRED_VERSION_linux ?= "2.6.23"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
 
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 09517fd11d..68bf1b9025 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
@@ -47,3 +47,7 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
+
+# set partition to flash kernel into
+MTD_KERNEL_PARTITION = "/dev/mtd2"
+
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 4cad7924f1..25c3878ee3 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
@@ -49,3 +49,7 @@ include conf/machine/include/tune-arm920t.inc
 
 # build YAFFS2
 IMAGE_FSTYPES ?= "jffs2 yaffs2"
+
+# set partition to flash kernel into
+MTD_KERNEL_PARTITION = "/dev/mtd2"
+
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 15390d2d56..439c484970 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -15,7 +15,7 @@ ROOT_FLASH_SIZE = "16"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 409eacaed5..99e82d28f4 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen vfat"
 
 
 # Some extra configuration
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 60a732ffa6..cad7d0393c 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -17,7 +17,7 @@ ROOT_FLASH_SIZE = "32"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat"
 
 #
 # Software/packages selection
@@ -26,13 +26,21 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader "
+MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround "
+MACHINE_EXTRA_RRECOMMENDS = "\
+    kernel-module-snd-h2200-audio \
+    kernel-module-i2c-pxa \
+    "
+
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 #
 # Modules autoload and other boot properties
 #
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-h2200-audio = "snd-h2200-audio"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 9cf8272b51..c037226154 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -17,7 +17,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget  screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat"
 
 #
 # Software/packages selection
@@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
+MACHINE_EXTRA_RRECOMMENDS = "\
                              kernel-module-micro"
 
 EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
-
-
-# TODO: see if any of these modules have 2.6 counterparts
-# and need to be RRECOMMENDED
-#
-#H3600_MODULES = "\
-#h3600-asic \
-#hwtimer \
-#nvrd \
-#sa1100-cs \
-#sa1100-ir \
-#sa1100-wdt \
-#sa1100-audio \
-#sa1100-rtc \
-#sa1100usb-core \
-#sd-mod \
-#serial-h3800 \
-#"
-
-
-
 #
 # Modules autoload and other boot properties
 #
diff --git a/conf/machine/h3800.conf b/conf/machine/h3800.conf
index 173f2a5c8f..a13ed48d4a 100644
--- a/conf/machine/h3800.conf
+++ b/conf/machine/h3800.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 38xx devices
 
 #this machine will be primarily focussed on the 2.6 port
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat"
 
 require conf/machine/h3600.conf
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index f475e20c46..5db7abd3d4 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index f56bee00e8..03dccedccc 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat"
 
 #
 # Software/packages selection
@@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
-                             kernel-module-h4000-pcmcia \
                              kernel-module-i2c-pxa \
+			     kernel-module-h4000-bt \
+                             kernel-module-h4000-pcmcia \
                              kernel-module-acx \
                             "
 
@@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \
 #
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h4000_audio = "snd-h4000_audio"
+module_autoload_snd-h4000-audio = "snd-h4000-audio"
 module_autoload_g_ether = "g_ether"
 module_conf_acx = "blacklist acx"
 
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 6ed836c1de..fcd6cfa0b9 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te  h5xxx"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat"
 
 #
 # Software/packages selection
@@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 #
 # Modules autoload and other boot properties
 #
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_g_ether = "g_ether"
+
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index 711ffd314c..65a82d1e0b 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -15,7 +15,7 @@ require conf/machine/include/tune-arm9tdmi.inc
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index 63ab097a89..6bf89999bf 100644
--- a/conf/machine/htcalpine.conf
+++ b/conf/machine/htcalpine.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
index 1b44742874..afaa6fc294 100644
--- a/conf/machine/htcapache.conf
+++ b/conf/machine/htcapache.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 44454f3902..a5feeb2d69 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "128"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 8430cb57d4..003406bd88 100644
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index f9326475e6..a577cc78d2 100644
--- a/conf/machine/htcsable.conf
+++ b/conf/machine/htcsable.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
index af91bcbb9f..016247213d 100644
--- a/conf/machine/htctornado.conf
+++ b/conf/machine/htctornado.conf
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index c3e7cf710e..55a6757e7c 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.inc
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone"
+MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone vfat"
 MACHINE_FEATURES += "iwmmxt"
 
 #
@@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
-                                kernel-module-nls-iso8859-1 \
-                                kernel-module-nls-utf8 \
-                                kernel-module-af-key \
-				kernel-module-bsd-comp \
+MACHINE_EXTRA_RRECOMMENDS = "\
 				kernel-module-i2c-pxa \
 				kernel-module-snd-htcuniversal-audio \
 				kernel-module-htcuniversal-acx \
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 38b0c011be..34255a1536 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "32"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index c0d9016407..84733217d1 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 
 MODUTILS = "26"	
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat"
 
 PCMCIA_MANAGER = "pcmciautils"
 
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 87e03a7bdd..0d3a9bbcf0 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: iPAQ hx47xx
+#@NAME: HP iPAQ hx47xx
 #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU
 
 #
@@ -19,7 +19,9 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "200"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat"
 MACHINE_FEATURES += "iwmmxt"
 
 #
@@ -34,17 +36,14 @@ XSERVER = "xserver-kdrive-w100"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
-				kernel-module-nls-iso8859-1 \
-				kernel-module-nls-utf8 \
-				kernel-module-af-key \
-				kernel-module-i2c-pxa \
-				kernel-module-pxa27x-voltage \
-				kernel-module-pxa27x-voltage-max158xx \
-				kernel-module-acx \
-				kernel-module-hx4700-acx \
-				kernel-module-hx4700-bt \
-				kernel-module-snd-hx4700-audio"
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-module-i2c-pxa \
+	kernel-module-pxa27x-voltage \
+	kernel-module-pxa27x-voltage-max158xx \
+	kernel-module-acx \
+	kernel-module-hx4700-acx \
+	kernel-module-hx4700-bt \
+	kernel-module-snd-hx4700-audio"
 
 #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
 EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
index f22ffce6c2..bc80185fa0 100644
--- a/conf/machine/include/collie-2.6.inc
+++ b/conf/machine/include/collie-2.6.inc
@@ -1,6 +1,33 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
+MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi vfat"
 
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+    mkdir ${IMAGE_NAME}-installkit/
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
+
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index 04b6542470..bdf00d15c9 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -2,20 +2,24 @@
 #@NAME: ixp4xx
 #@DESCRIPTION: genric machine configuration for ixp4xx platforms
 
-# Set default for nslu2 - can be overridden for machines with other features.
-MACHINE_FEATURES ?= "kernel26 usbhost ext2"
+# Set default for common ixp4xx-based machines
+MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
 
-# Set defaults for nslu2 - can be overridden for machines with other requirements.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS    ?= "ixp4xx-npe"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+# Select an appropriate default kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}"
+
+# Add packages required for basic networking support
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
 
-# Set default for nslu2 - can be overridden for machines with more flash.
+# Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
 
-# Set default for nslu2, nas100d, dsmg600
-EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
+# Allow for rootfs loaded direct from internal hard disk
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
+# Set default for common ixp4xx-based machines
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-xscale.inc
 require conf/machine/include/tune-thumb.inc
diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc
index 5eb7806f6f..22c6ad4233 100644
--- a/conf/machine/include/palm.inc
+++ b/conf/machine/include/palm.inc
@@ -10,7 +10,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2 vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 7e41da0783..3f84138ac8 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -26,7 +26,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf
deleted file mode 100644
index 0a1e54c324..0000000000
--- a/conf/machine/ixp4xx.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Generic IXP4XX kernel
-#@DESCRIPTION: Machine configuration for a generic ixp4xx board
-
-MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')}
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index a322f1a60c..3735bc0312 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -9,4 +9,4 @@ require conf/machine/include/tune-sh3.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen"
+MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat"
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 461d0c8326..8741eb4ff6 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -8,5 +8,5 @@ require conf/machine/include/tune-strongarm.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat"
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf
index f4fd23eec9..1792cda280 100644
--- a/conf/machine/looxc550.conf
+++ b/conf/machine/looxc550.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 900b24b751..1c1d08afb1 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -21,15 +21,9 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "142"
-MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost vfat"
 MACHINE_FEATURES += "iwmmxt"
 
-
-#
-# We don't support jffs2 installations (yet).
-#
-IMAGE_FSTYPES = "tar.bz2"
-
 #
 # Software/packages selection
 #
@@ -41,20 +35,20 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 MACHINE_EXTRA_RRECOMMENDS = " \
-	kernel-module-af-key \
 	kernel-module-i2c-pxa \
 	kernel-module-pxa27x-voltage \
 	kernel-module-pxa27x-voltage-max158xx \
-	kernel-module-leds-magician \
 	kernel-module-magician-ts \
-	kernel-module-magician-flash \
-	kernel-module-magician-ds1wm \
-	kernel-module-magician-battery \
 	kernel-module-magician-phone \
 	kernel-module-magician-pm \
 	kernel-module-n-tihtc \
 	kernel-module-snd-soc-magician"
 
+#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
+EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+			  -e 256KiB -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+
 
 #
 # Modules autoload and other boot properties
@@ -64,8 +58,6 @@ module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
-module_autoload_magician_ds1wm = "magician_ds1wm"
-module_autoload_magician-battery = "magician-battery"
 module_autoload_magician_phone = "magician_phone"
 module_autoload_magician_pm = "magician_pm"
 module_autoload_n_tihtc = "n_tihtc"
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index a6681a9030..af3e5a5cc3 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -15,6 +15,7 @@ require conf/machine/include/tune-xscale.inc
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by opie-collections.inc
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "16"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000"
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3c47b53b56..81c3e29e91 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -13,6 +13,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 PREFERRED_VERSION_u-boot = "1.3.0"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
 #don't try to access tty1
 USE_VT = "0"
 
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index 1c9fc7af9d..330a1287e4 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -15,7 +15,7 @@ USE_VT = "0"
 #use the epson xserver
 XSERVER = "xserver-kdrive-epson"
 
-MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen"
+MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen vfat"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttySA0 vt100"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 0e308b0a67..45fc16dc29 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -30,7 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
 # build tools
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index 703fc1984d..58ddb25744 100644
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800"
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
 # build tools
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
deleted file mode 100644
index 7e45825f69..0000000000
--- a/conf/machine/nslu2.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Linksys NSLU2
-#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
-
-MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')}
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 3162eb3342..360e397e04 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -6,8 +6,6 @@ TARGET_ARCH = "armeb"
 
 PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
 
-MACHINE_ARCH = "ixp4xxbe"
-
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ROOT_FLASH_SIZE ?= "6"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 1aced19de2..1ad9bdd96a 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -6,8 +6,6 @@ TARGET_ARCH = "arm"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
-MACHINE_ARCH = "ixp4xxle"
-
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ROOT_FLASH_SIZE ?= "6"
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index ba2c956d87..f8ca7ec033 100644
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat
 
 #
 # Software/packages selection
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index 4b3acc0a85..2531f984f0 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat"
 
 #
 # Software/packages selection
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index ab3da912ba..6334d34171 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -6,7 +6,7 @@ MACHINE_KERNEL_VERSION ?= "2.6"
 
 TARGET_ARCH = "arm"
 
-MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
+MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
 require conf/machine/include/tune-strongarm.inc
diff --git a/packages/atk/atk-1.2.0/.mtn2git_empty b/contrib/angstrom/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atk/atk-1.2.0/.mtn2git_empty
+++ b/contrib/angstrom/.mtn2git_empty
diff --git a/contrib/angstrom/angstrom.png b/contrib/angstrom/angstrom.png
new file mode 100644
index 0000000000..cdb84ae12b
--- /dev/null
+++ b/contrib/angstrom/angstrom.png
diff --git a/contrib/angstrom/angstrom.svg b/contrib/angstrom/angstrom.svg
new file mode 100644
index 0000000000..1cce5a547d
--- /dev/null
+++ b/contrib/angstrom/angstrom.svg
@@ -0,0 +1,639 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300"
+   height="300"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom"
+   sodipodi:docname="angstrom.svg"
+   inkscape:export-filename="/mnt/MultimediaA/passer_s.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ecece1"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="305.99401"
+     inkscape:cy="-129.81925"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     width="300px"
+     height="300px"
+     showgrid="true"
+     gridspacingx="1px"
+     gridspacingy="1px"
+     inkscape:grid-bbox="true"
+     inkscape:grid-points="true"
+     gridoriginy="0px"
+     gridoriginx="0px"
+     inkscape:window-width="1590"
+     inkscape:window-height="961"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:object-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;color:black;fill:#1c2422;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect17263"
+       width="46.672043"
+       height="39.924259"
+       x="-176.07109"
+       y="-55.51947"
+       ry="11.246277"
+       rx="11.246277" />
+    <rect
+       style="opacity:1;color:black;fill:#93aca7;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect17265"
+       width="46.672043"
+       height="39.924259"
+       x="-176.07109"
+       y="-3.3768997"
+       ry="11.246277"
+       rx="11.246277" />
+    <rect
+       style="opacity:1;color:black;fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect17267"
+       width="46.672043"
+       height="39.924259"
+       x="-176.07109"
+       y="100.90823"
+       ry="11.246277"
+       rx="11.246277" />
+    <rect
+       style="opacity:1;color:black;fill:#dbe3e2;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect17269"
+       width="46.672043"
+       height="39.924259"
+       x="-176.07109"
+       y="153.05081"
+       ry="11.246277"
+       rx="11.246277" />
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond"
+       x="-219"
+       y="222"
+       id="text1929"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan1931"
+         x="-219"
+         y="222">Colour scheme</tspan></text>
+    <rect
+       style="opacity:1;color:black;fill:#6f918a;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.47713897;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect4585"
+       width="46.672043"
+       height="39.924259"
+       x="-176.07109"
+       y="48.765663"
+       ry="11.246277"
+       rx="11.246277" />
+    <g
+       id="g1927"
+       transform="matrix(2.146701,0,0,2.146701,-398.0853,376.2692)"
+       inkscape:export-filename="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom/angstrom.png"
+       inkscape:export-xdpi="95.910004"
+       inkscape:export-ydpi="95.910004">
+      <text
+         transform="matrix(0,-1,1,0,0,0)"
+         sodipodi:linespacing="100%"
+         id="text1930"
+         y="94.3358"
+         x="-86.595512"
+         style="font-size:20.16246986px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#536c67;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Serif"
+         xml:space="preserve"><tspan
+           y="94.3358"
+           x="-86.595512"
+           id="tspan1932"
+           sodipodi:role="line">ngström</tspan></text>
+      <path
+         id="path1934"
+         d="M 78.016636,93.581841 C 77.603166,93.58185 77.252031,93.729524 76.963231,94.024864 C 76.667895,94.313657 76.520222,94.664793 76.520212,95.078274 C 76.520222,95.498333 76.664617,95.852751 76.953385,96.14153 C 77.235627,96.423757 77.590041,96.564868 78.016636,96.564863 C 78.430148,96.564868 78.781283,96.423757 79.070052,96.14153 C 79.358851,95.852751 79.503246,95.498333 79.503225,95.078274 C 79.503246,94.664793 79.358851,94.313657 79.070052,94.024864 C 78.781283,93.729524 78.430148,93.58185 78.016636,93.581841 M 88.698417,98.277885 L 88.698417,92.902539 L 81.708498,95.580367 L 88.698417,98.277885 M 94.024538,102.43246 L 92.980973,102.43246 L 92.980973,101.14276 L 80.399121,96.328584 C 80.156295,96.801147 79.834688,97.162129 79.434312,97.411529 C 79.033966,97.654375 78.561408,97.775797 78.016636,97.775793 C 77.268445,97.775797 76.631799,97.513265 76.106721,96.988195 C 75.575105,96.463137 75.309298,95.826498 75.309277,95.078274 C 75.309298,94.330066 75.575105,93.693426 76.106721,93.168353 C 76.631799,92.636735 77.268445,92.370921 78.016636,92.370912 C 78.541715,92.370921 79.014274,92.498906 79.434312,92.754865 C 79.847813,93.010843 80.16942,93.375106 80.399121,93.847655 L 92.980973,89.003937 L 92.980973,87.556728 L 94.024538,87.556728 L 94.024538,92.902539 L 92.980973,92.902539 L 92.980973,91.268276 L 89.751828,92.498895 L 89.751828,98.681529 L 92.980973,99.912148 L 92.980973,98.297575 L 94.024538,98.297575 L 94.024538,102.43246"
+         style="font-size:19.43293762px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#536c67;fill-opacity:1;stroke:#536c67;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:DejaVu Serif" />
+    </g>
+    <g
+       id="g1936"
+       transform="matrix(2.052686,0,0,2.052686,-404.4489,380.2516)"
+       inkscape:export-filename="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom/angstrom.png"
+       inkscape:export-xdpi="95.910004"
+       inkscape:export-ydpi="95.910004">
+      <path
+         sodipodi:nodetypes="cc"
+         id="path1938"
+         d="M 12.999066,47.703463 L 55.357092,47.703463"
+         style="fill:#374845;fill-rule:evenodd;stroke:#6f918a;stroke-width:2.15206432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(0.794213,0,0,0.794213,161.2522,0.580159)"
+         d="M -150 26 A 10 10 0 1 1  -170,26 A 10 10 0 1 1  -150 26 z"
+         sodipodi:ry="10"
+         sodipodi:rx="10"
+         sodipodi:cy="26"
+         sodipodi:cx="-160"
+         id="path1940"
+         style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f918a;stroke-width:1.56876302;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cccccccczc"
+         id="path1942"
+         d="M 32.589654,1.1096339 L 32.589654,2.6980598 L 32.589654,11.752088 L 33.330918,14.50536 L 35.02524,14.50536 L 35.766506,11.752088 L 35.766506,2.6980598 L 35.766506,1.1096339 C 35.23703,1.021388 34.707554,0.84489625 34.178079,0.84489625 C 33.648604,0.84489625 33.119128,1.021388 32.589654,1.1096339 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         id="path1944"
+         d="M 3.4488346,94.677852 L 1.9959014,102.74656 L 2.3485637,105.51135 L 3.6040027,103.02868 L 5.0569359,94.988187 L 3.4488346,94.677852 z "
+         style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.601179,0,0,1.601179,218.9345,-53.31984)"
+         d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1  -134.875,91.8125 A 1.8125 1.8125 0 1 1  -131.25 91.8125 z"
+         sodipodi:ry="1.8125"
+         sodipodi:rx="1.8125"
+         sodipodi:cy="91.8125"
+         sodipodi:cx="-133.0625"
+         id="path1946"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.42443681;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path1948"
+         d="M 65.113385,96.296589 L 66.285516,103.16021 L 65.262411,104.69422 L 63.809478,96.653724 L 65.113385,96.296589 z "
+         style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:#536c67;stroke-width:0.33979961;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path1950"
+         d="M 58.810986,73.853337 L 56.19236,74.95143 L 58.810986,73.853337"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.79286575;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path1952"
+         d="M 31.100503,25.233854 L 1.7477151,95.190781 L 2.0124527,101.51139 L 3.9979853,101.84231 L 34.178079,29.899855 L 64.358173,101.84231 L 66.343705,101.51139 L 66.608443,95.190781 L 37.255655,25.233854 L 34.906107,26.22662 L 34.178079,29.171827 L 33.450051,26.22662 L 31.100503,25.233854 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path1954"
+         d="M 50.955828,69.908335 L 55.257816,80.133827 L 59.526711,78.346848 L 56.316767,70.669455 L 50.955828,69.908335 z "
+         style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.5663327;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="matrix(1.601179,0,0,1.601179,275.5363,-51.72735)"
+         d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1  -134.875,91.8125 A 1.8125 1.8125 0 1 1  -131.25 91.8125 z"
+         sodipodi:ry="1.8125"
+         sodipodi:rx="1.8125"
+         sodipodi:cy="91.8125"
+         sodipodi:cx="-133.0625"
+         id="path1956"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.42443681;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path1958"
+         d="M 14.322754,46.379775 L 14.322754,49.027151"
+         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:3.28472996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path1960"
+         d="M 54.033404,46.379775 L 54.033404,49.027151"
+         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:3.28472996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path1962"
+         d="M 57.375198,79.240556 L 54.805887,73.113512 L 57.375198,79.240556"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.67959929;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path1964"
+         d="M 57.721094,71.214665 L 59.929123,76.480163 L 57.721094,71.214665"
+         style="color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="matrix(0.881113,0,0,0.881113,166.3452,-0.181653)"
+         d="M -147.5 33.5 A 2.5 2.5 0 1 1  -152.5,33.5 A 2.5 2.5 0 1 1  -147.5 33.5 z"
+         sodipodi:ry="2.5"
+         sodipodi:rx="2.5"
+         sodipodi:cy="33.5"
+         sodipodi:cx="-150"
+         id="path1966"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.77129638;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         id="path1968"
+         d="M 34.012618,42.938185 C 33.639517,43.017596 33.375542,43.351026 33.383866,43.732398 L 33.383866,51.674528 C 33.37981,51.960951 33.530297,52.227368 33.77769,52.371761 C 34.025092,52.516155 34.331066,52.516155 34.578468,52.371761 C 34.825861,52.227368 34.976348,51.960951 34.972292,51.674528 L 34.972292,43.732398 C 34.977598,43.489694 34.871628,43.257887 34.684607,43.10311 C 34.497586,42.948333 34.250045,42.887581 34.012618,42.938185 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.67959929;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.058951,0,0,1.058951,192.2794,-7.626709)"
+         d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+         sodipodi:ry="1.25"
+         sodipodi:rx="1.25"
+         sodipodi:cy="52.25"
+         sodipodi:cx="-158.75"
+         id="path1970"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.64176649;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.058951,0,0,1.058951,212.2935,-7.626709)"
+         d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+         sodipodi:ry="1.25"
+         sodipodi:rx="1.25"
+         sodipodi:cy="52.25"
+         sodipodi:cx="-158.75"
+         id="path1972"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.64176649;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path1974"
+         d="M 10.404637,86.686084 L 42.735724,9.6143312 L 10.404637,86.686084 z "
+         style="fill:white;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:0.56633264;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" />
+      <path
+         transform="matrix(0.422478,0,0,0.422478,72.47005,73.2379)"
+         d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+         sodipodi:ry="1.25"
+         sodipodi:rx="1.25"
+         sodipodi:cy="52.25"
+         sodipodi:cx="-158.75"
+         id="path1976"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:1.60860264;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="tekst">
+    <g
+       id="g18321"
+       transform="matrix(4.972105,0,0,4.972105,472.6639,-140.1673)">
+      <path
+         sodipodi:nodetypes="cc"
+         id="path18323"
+         d="M 12.76643,48.872248 L 54.26807,48.872248"
+         style="fill:#374845;fill-rule:evenodd;stroke:#6f918a;stroke-width:1.60260403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(0.778156,0,0,0.778156,158.0222,2.701674)"
+         d="M -150 26 A 10 10 0 1 1  -170,26 A 10 10 0 1 1  -150 26 z"
+         sodipodi:ry="10"
+         sodipodi:rx="10"
+         sodipodi:cy="26"
+         sodipodi:cx="-160"
+         id="path18325"
+         style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f918a;stroke-width:1.45228577;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cccccccczc"
+         id="path18327"
+         d="M 31.960939,3.220444 L 31.960939,4.7767555 L 31.960939,13.647731 L 32.687217,16.345338 L 34.347283,16.345338 L 35.073562,13.647731 L 35.073562,4.7767555 L 35.073562,3.220444 C 34.554791,3.1339823 34.03602,2.9610588 33.51725,2.9610588 C 32.99848,2.9610588 32.479709,3.1339823 31.960939,3.220444 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.53420138;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         id="path18329"
+         d="M 3.4092835,94.896918 L 1.9857254,102.80249 L 2.3312576,105.51139 L 3.5613144,103.07891 L 4.9848725,95.200979 L 3.4092835,94.896918 z "
+         style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.568807,0,0,1.568807,214.5383,-50.10859)"
+         d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1  -134.875,91.8125 A 1.8125 1.8125 0 1 1  -131.25 91.8125 z"
+         sodipodi:ry="1.8125"
+         sodipodi:rx="1.8125"
+         sodipodi:cy="91.8125"
+         sodipodi:cx="-133.0625"
+         id="path18331"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.20430867;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path18333"
+         d="M 63.80795,96.501979 L 64.956383,103.22684 L 63.953963,104.72984 L 62.530405,96.851893 L 63.80795,96.501979 z "
+         style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:#536c67;stroke-width:0.32052082;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path18335"
+         d="M 57.652134,74.493429 L 55.086451,75.569321 L 57.652134,74.493429"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.74788189;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path18337"
+         d="M 30.501896,26.856925 L 1.7425569,95.399477 L 2.0019421,101.5923 L 3.9473315,101.91653 L 33.51725,31.42859 L 63.087169,101.91653 L 65.032558,101.5923 L 65.291943,95.399477 L 36.532604,26.856925 L 34.230559,27.82962 L 33.51725,30.715281 L 32.803941,27.82962 L 30.501896,26.856925 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.53420138;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path18339"
+         d="M 49.95579,70.628186 L 54.170801,80.646941 L 58.353388,78.896091 L 55.208342,71.373918 L 49.95579,70.628186 z "
+         style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.32052094;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="matrix(1.568807,0,0,1.568807,269.9957,-48.54829)"
+         d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1  -134.875,91.8125 A 1.8125 1.8125 0 1 1  -131.25 91.8125 z"
+         sodipodi:ry="1.8125"
+         sodipodi:rx="1.8125"
+         sodipodi:cy="91.8125"
+         sodipodi:cx="-133.0625"
+         id="path18341"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.20430867;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path18343"
+         d="M 14.063356,47.575322 L 14.063356,50.169174"
+         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:2.67100668;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path18345"
+         d="M 52.971144,47.575322 L 52.971144,50.169174"
+         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:2.67100668;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path18347"
+         d="M 56.245374,79.77173 L 53.728009,73.768562 L 56.245374,79.77173"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.32052082;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path18349"
+         d="M 56.584277,71.908105 L 58.747664,77.067146 L 56.584277,71.908105"
+         style="color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.74788189;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="matrix(0.863299,0,0,0.863299,163.0122,1.955264)"
+         d="M -147.5 33.5 A 2.5 2.5 0 1 1  -152.5,33.5 A 2.5 2.5 0 1 1  -147.5 33.5 z"
+         sodipodi:ry="2.5"
+         sodipodi:rx="2.5"
+         sodipodi:cy="33.5"
+         sodipodi:cx="-150"
+         id="path18351"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.37127414;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         id="path18353"
+         d="M 33.355134,44.203314 C 32.989577,44.281119 32.730939,44.607808 32.739094,44.981469 L 32.739094,52.763027 C 32.73512,53.043659 32.882565,53.30469 33.124956,53.446163 C 33.367356,53.587638 33.667144,53.587638 33.909544,53.446163 C 34.151935,53.30469 34.29938,53.043659 34.295406,52.763027 L 34.295406,44.981469 C 34.300604,44.743672 34.196777,44.516552 34.013537,44.364904 C 33.830297,44.213256 33.587761,44.153733 33.355134,44.203314 z "
+         style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.32052082;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.037541,0,0,1.037541,188.4221,-5.339269)"
+         d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+         sodipodi:ry="1.25"
+         sodipodi:rx="1.25"
+         sodipodi:cy="52.25"
+         sodipodi:cx="-158.75"
+         id="path18355"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.30892351;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.037541,0,0,1.037541,208.0316,-5.339269)"
+         d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+         sodipodi:ry="1.25"
+         sodipodi:rx="1.25"
+         sodipodi:cy="52.25"
+         sodipodi:cx="-158.75"
+         id="path18357"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.30892351;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path18359"
+         d="M 10.224455,87.066726 L 41.901878,11.553195 L 10.224455,87.066726 z "
+         style="fill:white;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:0.53420138;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" />
+      <path
+         transform="matrix(0.413936,0,0,0.413936,71.03504,73.89043)"
+         d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+         sodipodi:ry="1.25"
+         sodipodi:rx="1.25"
+         sodipodi:cy="52.25"
+         sodipodi:cx="-158.75"
+         id="path18361"
+         style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.77432352;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond"
+       x="505.65808"
+       y="413.98828"
+       id="text1921"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan1923"
+         x="505.65808"
+         y="413.98828">Large version, thinner lines</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond"
+       x="-423.13144"
+       y="648.26971"
+       id="text1925"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan1927"
+         x="-423.13144"
+         y="648.26971">Small version for psplash</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Garamond"
+       x="-20"
+       y="360"
+       id="text1978"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         x="-20"
+         y="360"
+         id="tspan1982">Small version for psplash (300×300)</tspan></text>
+    <g
+       id="g2936"
+       transform="translate(-476.8848,-138.3898)">
+      <g
+         transform="matrix(2.942637,0,0,2.942637,481.8975,134.4777)"
+         id="g21062">
+        <text
+           xml:space="preserve"
+           style="font-size:20.16246986px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#536c67;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Serif"
+           x="-86.595512"
+           y="94.3358"
+           id="text1941"
+           sodipodi:linespacing="100%"
+           transform="matrix(0,-1,1,0,0,0)"><tspan
+             sodipodi:role="line"
+             id="tspan1943"
+             x="-86.595512"
+             y="94.3358">ngström</tspan></text>
+        <path
+           style="font-size:19.43293762px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#536c67;fill-opacity:1;stroke:none;stroke-width:0.10194937;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:DejaVu Serif"
+           d="M 78.016636,93.581841 C 77.603166,93.58185 77.252031,93.729524 76.963231,94.024864 C 76.667895,94.313657 76.520222,94.664793 76.520212,95.078274 C 76.520222,95.498333 76.664617,95.852751 76.953385,96.14153 C 77.235627,96.423757 77.590041,96.564868 78.016636,96.564863 C 78.430148,96.564868 78.781283,96.423757 79.070052,96.14153 C 79.358851,95.852751 79.503246,95.498333 79.503225,95.078274 C 79.503246,94.664793 79.358851,94.313657 79.070052,94.024864 C 78.781283,93.729524 78.430148,93.58185 78.016636,93.581841 M 94.024538,102.43246 L 92.980973,102.43246 L 92.980973,101.14276 L 80.399121,96.328584 C 80.156295,96.801147 79.834688,97.162129 79.434312,97.411529 C 79.033966,97.654375 78.561408,97.775797 78.016636,97.775793 C 77.268445,97.775797 76.631799,97.513265 76.106721,96.988195 C 75.575105,96.463137 75.309298,95.826498 75.309277,95.078274 C 75.309298,94.330066 75.575105,93.693426 76.106721,93.168353 C 76.631799,92.636735 77.268445,92.370921 78.016636,92.370912 C 78.541715,92.370921 79.014274,92.498906 79.434312,92.754865 C 79.847813,93.010843 80.16942,93.375106 80.399121,93.847655 L 92.980973,89.003937 L 92.980973,87.556728 L 94.024538,87.556728 L 94.024538,92.902539 L 92.980973,92.902539 L 92.980973,91.268276 L 81.708498,95.580367 L 92.980973,99.912148 L 92.980973,98.297575 L 94.024538,98.297575 L 94.024538,102.43246"
+           id="text17274"
+           sodipodi:nodetypes="ccssscsccccccccscscscccccccccccc" />
+      </g>
+      <g
+         transform="matrix(2.813764,0,0,2.813764,476.4644,139.9367)"
+         id="g21067">
+        <path
+           style="fill:#374845;fill-rule:evenodd;stroke:#6f918a;stroke-width:2.15206432;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 12.999066,47.703463 L 55.357092,47.703463"
+           id="path1945"
+           sodipodi:nodetypes="cc" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f918a;stroke-width:1.56876302;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path1947"
+           sodipodi:cx="-160"
+           sodipodi:cy="26"
+           sodipodi:rx="10"
+           sodipodi:ry="10"
+           d="M -150 26 A 10 10 0 1 1  -170,26 A 10 10 0 1 1  -150 26 z"
+           transform="matrix(0.794213,0,0,0.794213,161.2522,0.580159)" />
+        <path
+           style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 32.589654,1.1096339 L 32.589654,2.6980598 L 32.589654,11.752088 L 33.330918,14.50536 L 35.02524,14.50536 L 35.766506,11.752088 L 35.766506,2.6980598 L 35.766506,1.1096339 C 35.23703,1.021388 34.707554,0.84489625 34.178079,0.84489625 C 33.648604,0.84489625 33.119128,1.021388 32.589654,1.1096339 z "
+           id="path1949"
+           sodipodi:nodetypes="cccccccczc" />
+        <path
+           style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 3.4488346,94.677852 L 1.9959014,102.74656 L 2.3485637,105.51135 L 3.6040027,103.02868 L 5.0569359,94.988187 L 3.4488346,94.677852 z "
+           id="path2854"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.42443681;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path3767"
+           sodipodi:cx="-133.0625"
+           sodipodi:cy="91.8125"
+           sodipodi:rx="1.8125"
+           sodipodi:ry="1.8125"
+           d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1  -134.875,91.8125 A 1.8125 1.8125 0 1 1  -131.25 91.8125 z"
+           transform="matrix(1.601179,0,0,1.601179,218.9345,-53.31984)" />
+        <path
+           style="fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:#536c67;stroke-width:0.33979961;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 65.113385,96.296589 L 66.285516,103.16021 L 65.262411,104.69422 L 63.809478,96.653724 L 65.113385,96.296589 z "
+           id="path2878"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.79286575;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 58.810986,73.853337 L 56.19236,74.95143 L 58.810986,73.853337"
+           id="path10016"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 31.100503,25.233854 L 1.7477151,95.190781 L 2.0124527,101.51139 L 3.9979853,101.84231 L 34.178079,29.899855 L 64.358173,101.84231 L 66.343705,101.51139 L 66.608443,95.190781 L 37.255655,25.233854 L 34.906107,26.22662 L 34.178079,29.171827 L 33.450051,26.22662 L 31.100503,25.233854 z "
+           id="path1951" />
+        <path
+           style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.5663327;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 50.955828,69.908335 L 55.257816,80.133827 L 59.526711,78.346848 L 56.316767,70.669455 L 50.955828,69.908335 z "
+           id="rect6452" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#93aca7;stroke-width:0.42443681;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path3765"
+           sodipodi:cx="-133.0625"
+           sodipodi:cy="91.8125"
+           sodipodi:rx="1.8125"
+           sodipodi:ry="1.8125"
+           d="M -131.25 91.8125 A 1.8125 1.8125 0 1 1  -134.875,91.8125 A 1.8125 1.8125 0 1 1  -131.25 91.8125 z"
+           transform="matrix(1.601179,0,0,1.601179,275.5363,-51.72735)" />
+        <path
+           style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:3.28472996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 14.322754,46.379775 L 14.322754,49.027151"
+           id="path5559"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:#4d4d4d;fill-rule:evenodd;stroke:#6f918a;stroke-width:3.28472996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 54.033404,46.379775 L 54.033404,49.027151"
+           id="path5561"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.67959929;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 57.375198,79.240556 L 54.805887,73.113512 L 57.375198,79.240556"
+           id="path8228"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.9061324;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 57.721094,71.214665 L 59.929123,76.480163 L 57.721094,71.214665"
+           id="path9123"
+           sodipodi:nodetypes="ccc" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.77129638;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path13689"
+           sodipodi:cx="-150"
+           sodipodi:cy="33.5"
+           sodipodi:rx="2.5"
+           sodipodi:ry="2.5"
+           d="M -147.5 33.5 A 2.5 2.5 0 1 1  -152.5,33.5 A 2.5 2.5 0 1 1  -147.5 33.5 z"
+           transform="matrix(0.881113,0,0,0.881113,166.3452,-0.181653)" />
+        <path
+           style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.67959929;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 34.012618,42.938185 C 33.639517,43.017596 33.375542,43.351026 33.383866,43.732398 L 33.383866,51.674528 C 33.37981,51.960951 33.530297,52.227368 33.77769,52.371761 C 34.025092,52.516155 34.331066,52.516155 34.578468,52.371761 C 34.825861,52.227368 34.976348,51.960951 34.972292,51.674528 L 34.972292,43.732398 C 34.977598,43.489694 34.871628,43.257887 34.684607,43.10311 C 34.497586,42.948333 34.250045,42.887581 34.012618,42.938185 z "
+           id="path4672" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.64176649;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path11020"
+           sodipodi:cx="-158.75"
+           sodipodi:cy="52.25"
+           sodipodi:rx="1.25"
+           sodipodi:ry="1.25"
+           d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+           transform="matrix(1.058951,0,0,1.058951,192.2794,-7.626709)" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:0.64176649;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path11907"
+           sodipodi:cx="-158.75"
+           sodipodi:cy="52.25"
+           sodipodi:rx="1.25"
+           sodipodi:ry="1.25"
+           d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+           transform="matrix(1.058951,0,0,1.058951,212.2935,-7.626709)" />
+        <path
+           style="fill:white;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:0.56633264;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+           d="M 10.404637,86.686084 L 42.735724,9.6143312 L 10.404637,86.686084 z "
+           id="path3777"
+           sodipodi:nodetypes="ccc" />
+        <path
+           sodipodi:type="arc"
+           style="color:black;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#93aca7;stroke-width:1.60860264;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path11909"
+           sodipodi:cx="-158.75"
+           sodipodi:cy="52.25"
+           sodipodi:rx="1.25"
+           sodipodi:ry="1.25"
+           d="M -157.5 52.25 A 1.25 1.25 0 1 1  -160,52.25 A 1.25 1.25 0 1 1  -157.5 52.25 z"
+           transform="matrix(0.422478,0,0,0.422478,72.47005,73.2379)" />
+      </g>
+    </g>
+    <rect
+       style="opacity:1;color:black;fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:#536c67;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2964"
+       width="0"
+       height="15.817692"
+       x="436.01993"
+       y="359.46634"
+       rx="2.2974668"
+       ry="4.2123618" />
+    <rect
+       style="opacity:1;color:black;fill:#536c67;fill-opacity:1;fill-rule:evenodd;stroke:#536c67;stroke-width:0.46281698;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="rect2966"
+       width="2.6431277"
+       height="13.088069"
+       x="255.23138"
+       y="270.68051" />
+  </g>
+</svg>
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
new file mode 100755
index 0000000000..fb117d6c11
--- /dev/null
+++ b/contrib/angstrom/build-feeds.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+DO_UCLIBC=0
+
+do_build() {
+	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+
+	BUILD_MODE="glibc"
+	if [ "$BUILD_CLEAN" != "" ]
+	then
+		bitbake -c clean $BUILD_CLEAN
+	fi
+
+	for target in $BUILD_TARGETS
+	do
+		bitbake $target && do_report_success
+	done
+
+	if [ $DO_UCLIBC = 1 ]
+	then
+		BUILD_MODE="uclibc"
+		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+		for target in $BUILD_TARGETS
+		do
+			bitbake $target && do_report_success
+		done
+	fi
+}
+
+do_report_success() {
+
+	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
+}
+
+for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
+do
+        BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
+        BUILD_TARGETS="texinfo flex bison gcc binutils automake autoconf m4 pkgconfig \
+	               task-proper-tools mc screen emacs \
+	               mono perl python ruby \
+		       gtk+ qt-x11-free qt4-x11-free \
+		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
+		       samba \
+		       apache2 boa cherokee lighttpd thttpd \
+		       gpe-gallery gpe-scap notecase \
+		       pidgin irssi \
+		       roadmap-gtk2 gpsdrive navit \
+		       xmms mplayer quasar \
+		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
+		       gpe-bluetooth bluez-gnome python-pybluez \
+		       abiword gnumeric evince epdfview gimp \
+		       flite \
+		       ctorrent \
+		       gnuplot octave fftw fftwf fftwl \
+		       gphoto2 gqview imagemagick ufraw \
+		       tzdata \
+		      "
+	do_build
+done
+
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
new file mode 100755
index 0000000000..54c9fb4fa4
--- /dev/null
+++ b/contrib/angstrom/build-release.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+DO_UCLIBC=0
+
+do_build() {
+	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+
+	BUILD_MODE="glibc"
+	if [ "$BUILD_CLEAN" != "" ]
+	then
+		bitbake -c clean $BUILD_CLEAN
+	fi
+
+	for target in $BUILD_TARGETS
+	do
+		bitbake $target && do_report_success
+	done
+
+	if [ $DO_UCLIBC = 1 ]
+	then
+		BUILD_MODE="uclibc"
+		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+		for target in $BUILD_TARGETS
+		do
+			bitbake $target && do_report_success
+		done
+	fi
+}
+
+do_report_success() {
+
+	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log
+}
+
+#cross toolchain
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-toolchain"
+#       BUILD_CLEAN="meta-toolchain"
+#        do_build
+#done
+
+
+# No graphics
+for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
+do
+	BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross base-files"
+	BUILD_TARGETS="base-image console-image"
+	do_build
+done
+
+for machine in ixp4xxle ixp4xxbe 
+do
+	BUILD_CLEAN="base-files"
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="base-image nslu2-base-image"
+	do_build
+done	 
+
+# build altboot images for zaurus
+for machine in c7x0 poodle tosa akita spitz collie
+do
+	BUILD_CLEAN="base-files"
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="altboot-console-image"
+	do_build
+done  
+
+# graphics, flash storage
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie simpad 
+do
+	BUILD_CLEAN="base-files"
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
+	do_build
+done
+
+# graphics, disk storage	
+for machine in spitz 
+do
+	BUILD_CLEAN="base-files"
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image"
+	do_build
+done 
+
+#phones
+for machine in fic-gta01 a780 
+do
+	BUILD_MACHINE=$machine
+	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
+	do_build
+done	
+
+# populate feeds
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-angstrom-2007"
+#	do_build
+#done
+
diff --git a/contrib/angstrom/rss.php b/contrib/angstrom/rss.php
new file mode 100644
index 0000000000..cf5a9e0218
--- /dev/null
+++ b/contrib/angstrom/rss.php
@@ -0,0 +1,48 @@
+<?php echo ('<?xml version="1.0" encoding="utf-8"?>'); ?>
+<rss version="2.0" xml:base="http://www.angstrom-distribution.org/unstable/autobuild/" xmlns:dc="http://purl.org/dc/elements/1.1/">
+	<channel>
+		<title>Ångström autobuilder updates</title>
+		<link>http://www.angstrom-distribution.org/unstable/autobuild/</link>
+		<description></description>
+		<language>en</language>
+<?php
+
+$base_path = "/home/angstrom/website/unstable/autobuild";
+
+if ($handle = opendir("$base_path")) 
+{
+	while (false !== ($file = readdir($handle))) 
+	{
+		if(!(is_dir($file) && $file != "." && $file != ".."))
+		{
+			continue;
+		}
+
+		$second_handle = opendir("$base_path/$file/");
+
+		while (false !== ($file2 = readdir($second_handle))) 
+		{
+			if(is_file("/$base_path/$file/$file2")) 
+			{ 
+				$fmtime = filemtime("$file/$file2");
+
+				echo "<item>\n"
+				echo "<title>$file/$file2 uploaded</title>\n";
+				echo " <link>http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2</link>\n";
+
+				$rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime);
+
+				echo "<pubDate>$rsstime</pubDate>\n";
+				echo "<dc:creator>Angstrom autobuilder</dc:creator>";
+				echo "</item>\n";
+			}
+		}
+
+		closedir($second_handle);
+	}
+
+	closedir($handle);
+}
+?>
+	</channel>
+</rss>
diff --git a/contrib/angstrom/rss2.php b/contrib/angstrom/rss2.php
new file mode 100644
index 0000000000..995c344e14
--- /dev/null
+++ b/contrib/angstrom/rss2.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This generator expect only log from autobuilder in simple format:
+ * TIME_OF_BUILD BUILD_TARGET BUILD_MODE MACHINE
+ *
+ * where TIME_OF_BUILD is epoch
+ *
+ * All what it does is parsing log and output it in reverse order (new builds 
+ * first) in RSS 2.0 format.
+ *
+ * (C) 2007 Marcin Juszkiewicz
+ *
+ * License: MIT
+ *
+ */
+
+$build_link_base = 'http://www.angstrom-distribution.org/unstable/autobuild/';
+
+$builder_log_date = file('autobuilder.log');
+
+if(empty($builder_log_date))
+	die("No logs\n");
+
+$builder_log_date = array_reverse($builder_log_date);
+
+$rss_xml = new xmlWriter();
+
+if(!$rss_xml)
+	die("Unable to create XML Writer\n");
+
+$rss_xml->openMemory();
+
+$rss_xml->startDocument('1.0','utf-8');
+$rss_xml->startElement('rss');
+$rss_xml->writeAttribute('version', '2.0');
+
+$rss_xml->startElement('channel');
+
+$rss_xml->writeElement('title', 'Ångström autobuilder updates');
+$rss_xml->writeElement('link', $build_link_base);
+$rss_xml->writeElement('description', 'Ångström autobuilder updates list');
+
+foreach($builder_log_date as $build)
+{
+	$build = str_replace("\n", "", $build);
+	$data = explode(' ', $build);
+
+	$rss_xml->startElement('item');
+	$rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}");
+	$rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/");
+	$rss_xml->writeElement('pubDate', date('r', $data[0]));
+
+	$rss_xml->endElement();
+}
+
+$rss_xml->endElement();
+$rss_xml->endElement();
+
+echo $rss_xml->outputMemory(true);   
+
+echo "\n";
+?>
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index 416d393ccd..15d2722a8b 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -11,7 +11,7 @@ else
     export OLD_REV="l:\"1 week ago\""
 fi
 
-for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
+for i in `mtn log --brief --no-graph --no-merges --to "${OLD_REV}" --from "${REV_NOW}"| awk '{print $2 ":" $1}'` ; do \
         export REV=`echo $i | awk -F: '{print $2}'`
         export AUTHOR=`echo $i | awk -F: '{print $1}'`
         export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : '  '{ print $2 }'`
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 1317f23b4a..440434229c 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -2,7 +2,8 @@
 
 # generate Python Manifest for the OpenEmbedded build system
 # (C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
-# MIT license
+# (C) 2007 Jeremy Laine
+# licensed under MIT, see COPYING.MIT
 
 import os
 import sys
@@ -10,10 +11,10 @@ import time
 
 VERSION = "2.5.1"
 # increase when touching python-core, this should be the same ml version as in python_2.5.1.bb
-BASEREV = 2
+BASEREV = 5
 
 __author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-__version__ = "20070823"
+__version__ = "20071205"
 
 class MakefileMaker:
 
@@ -145,7 +146,7 @@ if __name__ == "__main__":
     # Parameters: revision, name, description, dependencies, filenames
     #
 
-    m.addPackage( 2, "python-core", "Python Interpreter and core modules (needed!)", "",
+    m.addPackage( 0, "python-core", "Python Interpreter and core modules (needed!)", "",
     "__future__.* copy.* copy_reg.* ConfigParser.* " +
     "getopt.* linecache.* new.* " +
     "os.* posixpath.* struct.* " +
@@ -175,7 +176,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core",
     "bsddb" ) # package
 
-    m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core",
+    m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core python-lang",
     "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
 
     m.addPackage( 0, "python-compile", "Python Bytecode Compilation Support", "python-core",
@@ -194,7 +195,10 @@ if __name__ == "__main__":
     "lib-dynload/_csv.so csv.* optparse.* textwrap.*" )
 
     m.addPackage( 0, "python-curses", "Python Curses Support", "python-core",
-    "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package
+    "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module
+
+    m.addPackage( 0, "python-ctypes", "Python C Types Support", "python-core",
+    "ctypes lib-dynload/_ctypes.so" ) # directory + low level module
 
     m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core python-codecs",
     "_strptime.* calendar.* lib-dynload/datetime.so" )
@@ -257,7 +261,7 @@ if __name__ == "__main__":
     m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core",
     "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
 
-    m.addPackage( 0, "python-netclient", "Python Internet Protocol Clients", "python-core python-datetime python-io python-lang python-logging python-mime",
+    m.addPackage( 0, "python-netclient", "Python Internet Protocol Clients", "python-core python-crypt python-datetime python-io python-lang python-logging python-mime",
     "*Cookie*.* " + 
     "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" )
 
diff --git a/packages/agg/agg_2.5.bb b/packages/agg/agg_2.5.bb
index f91d0112be..a3cf4b9557 100644
--- a/packages/agg/agg_2.5.bb
+++ b/packages/agg/agg_2.5.bb
@@ -8,12 +8,12 @@ DEPENDS = "virtual/libx11 virtual/libsdl freetype"
 PR = "r0"
 
 SRC_URI = "http://www.antigrain.com/${P}.tar.gz"
-
 S = "${WORKDIR}/${P}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+export SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config
+
 CFLAGS += " -I{$STAGING_INCDIR} "
 
 PACKAGES =+ "${PN}-sdl ${PN}-x11"
@@ -26,14 +26,18 @@ FILES_${PN} = "${libdir}/libagg.so.* \
 LEAD_SONAME = "libagg.so"
 
 do_stage() {
-        install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
-        install -d ${STAGING_INCDIR}/agg2
-        cd include
-        headers=`find . -name "*.h"`
-        for f in $headers
-        do
-                install -m 0644 $f ${STAGING_INCDIR}/agg2/
-        done
+    oe_libinstall -a -so libagg ${STAGING_LIBDIR}
+    oe_libinstall -a -so libaggfontfreetype ${STAGING_LIBDIR}
+    oe_libinstall -a -so libaggplatformX11 ${STAGING_LIBDIR}
+    oe_libinstall -a -so libaggplatformsdl ${STAGING_LIBDIR}
+    install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
+    install -d ${STAGING_INCDIR}/agg2
+    cd include
+    headers=`find . -name "*.h"`
+    for f in $headers
+    do
+            install -D -m 0644 $f ${STAGING_INCDIR}/agg2/$f
+    done
 }
 
 
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
index b9ee96d048..e22e992cc9 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
@@ -2,7 +2,7 @@ require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "69"
+SVN_REV = "70"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb
index 6730b6a044..1415080fbd 100644
--- a/packages/angstrom/angstrom-feed-configs.bb
+++ b/packages/angstrom/angstrom-feed-configs.bb
@@ -1,18 +1,26 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
-PR = "1"
+#PV = "${DISTRO_VERSION}"
+PR = "r3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
 
+IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}"
+
 do_compile() {
         mkdir -p ${S}/${sysconfdir}/ipkg
 	for feed in base debug perl python gstreamer ; do
           echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/ipkg/${feed}-feed.conf
 	done
 
-        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf
+        echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" >  ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf
 	echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf
+        
+	# iwmmxt is a special case, add the iwmmxt feed for machine that have 'iwmmxt' in MACHINE_FEATURES
+        if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then
+	  echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/ipkg/iwmmxt-feed.conf
+	fi  
 }
 
 
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
index 265f51863d..cc3d08972f 100644
--- a/packages/angstrom/angstrom-gpe-task-base.bb
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
 
 inherit task
 
@@ -12,6 +12,8 @@ RDEPENDS_${PN} = "\
     rxvt-unicode \
     gpe-terminal \
     matchbox-keyboard \
+    xkbd \
+    xkbd-layout-ru \
     gpe-theme-clearlooks \
     xst \
     xhost \
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index a9463fdbe5..adc4bb0756 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
 
 inherit task
 
 RDEPENDS_${PN} = "\
     matchbox-panel-manager \
+    mboxkbd-layouts-gui \
     gpe-su \
     gpe-conf \
     gpe-package \
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index b58aa41756..d5fb0cff21 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -1,9 +1,9 @@
 SECTION = "net"
 DEPENDS = "expat pcre"
 
-inherit  native
+inherit cross 
 
-PR="r5"
+PR="r6"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
diff --git a/packages/atk/atk-1.2.0/m4.patch b/packages/atk/atk-1.2.0/m4.patch
deleted file mode 100644
index 8f373364e4..0000000000
--- a/packages/atk/atk-1.2.0/m4.patch
+++ /dev/null
@@ -1,2458 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null
-+++ atk-1.2.0/m4/codeset.m4
-@@ -0,0 +1,23 @@
-+# codeset.m4 serial AM1 (gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_LANGINFO_CODESET],
-+[
-+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-+    [AC_TRY_LINK([#include <langinfo.h>],
-+      [char* cs = nl_langinfo(CODESET);],
-+      am_cv_langinfo_codeset=yes,
-+      am_cv_langinfo_codeset=no)
-+    ])
-+  if test $am_cv_langinfo_codeset = yes; then
-+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/gettext.m4
-@@ -0,0 +1,587 @@
-+# gettext.m4 serial 17 (gettext-0.11.5)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-+
-+dnl Macro to add for using GNU gettext.
-+
-+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-+dnl    default (if it is not specified or empty) is 'no-libtool'.
-+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-+dnl    $(top_builddir)/intl/libintl.a will be created.
-+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-+dnl    implementations (in libc or libintl) without the ngettext() function
-+dnl    will be ignored.  If NEEDSYMBOL is specified and is
-+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-+dnl INTLDIR is used to find the intl libraries.  If empty,
-+dnl    the value `$(top_builddir)/intl/' is used.
-+dnl
-+dnl The result of the configuration is one of three cases:
-+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-+dnl    and used.
-+dnl    Catalog format: GNU --> install in $(datadir)
-+dnl    Catalog extension: .mo after installation, .gmo in source tree
-+dnl 2) GNU gettext has been found in the system's C library.
-+dnl    Catalog format: GNU --> install in $(datadir)
-+dnl    Catalog extension: .mo after installation, .gmo in source tree
-+dnl 3) No internationalization, always use English msgid.
-+dnl    Catalog format: none
-+dnl    Catalog extension: none
-+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-+dnl The use of .gmo is historical (it was needed to avoid overwriting the
-+dnl GNU format catalogs when building on a platform with an X/Open gettext),
-+dnl but we keep it in order not to force irrelevant filename changes on the
-+dnl maintainers.
-+dnl
-+AC_DEFUN([AM_GNU_GETTEXT],
-+[
-+  dnl Argument checking.
-+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-+])])])])])
-+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-+])])])])
-+  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-+  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+
-+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-+  ifelse(gt_included_intl, yes, [
-+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-+  ])
-+
-+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+
-+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+  dnl Ideally we would do this search only after the
-+  dnl      if test "$USE_NLS" = "yes"; then
-+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-+  dnl the configure script would need to contain the same shell code
-+  dnl again, outside any 'if'. There are two solutions:
-+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-+  dnl documented, we avoid it.
-+  ifelse(gt_included_intl, yes, , [
-+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+  ])
-+
-+  AC_MSG_CHECKING([whether NLS is requested])
-+  dnl Default is enabled NLS
-+  AC_ARG_ENABLE(nls,
-+    [  --disable-nls           do not use Native Language Support],
-+    USE_NLS=$enableval, USE_NLS=yes)
-+  AC_MSG_RESULT($USE_NLS)
-+  AC_SUBST(USE_NLS)
-+
-+  ifelse(gt_included_intl, yes, [
-+    BUILD_INCLUDED_LIBINTL=no
-+    USE_INCLUDED_LIBINTL=no
-+  ])
-+  LIBINTL=
-+  LTLIBINTL=
-+  POSUB=
-+
-+  dnl If we use NLS figure out what method
-+  if test "$USE_NLS" = "yes"; then
-+    gt_use_preinstalled_gnugettext=no
-+    ifelse(gt_included_intl, yes, [
-+      AC_MSG_CHECKING([whether included gettext is requested])
-+      AC_ARG_WITH(included-gettext,
-+        [  --with-included-gettext use the GNU gettext library included here],
-+        nls_cv_force_use_gnu_gettext=$withval,
-+        nls_cv_force_use_gnu_gettext=no)
-+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-+
-+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+    ])
-+        dnl User does not insist on using GNU NLS library.  Figure out what
-+        dnl to use.  If GNU gettext is available we use this.  Else we have
-+        dnl to fall back to GNU NLS library.
-+
-+        dnl Add a version number to the cache macros.
-+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-+        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-+        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-+
-+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-+         [AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern int *_nl_domain_bindings;],
-+            [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-+            gt_cv_func_gnugettext_libc=yes,
-+            gt_cv_func_gnugettext_libc=no)])
-+
-+        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+          ifelse(gt_included_intl, yes, , [
-+            AM_ICONV_LINK
-+          ])
-+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-+          dnl even if libiconv doesn't exist.
-+          AC_LIB_LINKFLAGS_BODY([intl])
-+          AC_CACHE_CHECK([for GNU gettext in libintl],
-+            gt_cv_func_gnugettext_libintl,
-+           [gt_save_CPPFLAGS="$CPPFLAGS"
-+            CPPFLAGS="$CPPFLAGS $INCINTL"
-+            gt_save_LIBS="$LIBS"
-+            LIBS="$LIBS $LIBINTL"
-+            dnl Now see whether libintl exists and does not depend on libiconv.
-+            AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+              [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+              gt_cv_func_gnugettext_libintl=yes,
-+              gt_cv_func_gnugettext_libintl=no)
-+            dnl Now see whether libintl exists and depends on libiconv.
-+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-+              LIBS="$LIBS $LIBICONV"
-+              AC_TRY_LINK([#include <libintl.h>
-+]ifelse([$2], [need-formatstring-macros],
-+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-+#endif
-+changequote(,)dnl
-+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-+changequote([,])dnl
-+], [])[extern int _nl_msg_cat_cntr;
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+const char *_nl_expand_alias ();],
-+                [bindtextdomain ("", "");
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+               [LIBINTL="$LIBINTL $LIBICONV"
-+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-+                gt_cv_func_gnugettext_libintl=yes
-+               ])
-+            fi
-+            CPPFLAGS="$gt_save_CPPFLAGS"
-+            LIBS="$gt_save_LIBS"])
-+        fi
-+
-+        dnl If an already present or preinstalled GNU gettext() is found,
-+        dnl use it.  But if this macro is used in GNU gettext, and GNU
-+        dnl gettext is already preinstalled in libintl, we update this
-+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-+        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-+           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-+                && test "$PACKAGE" != gettext; }; then
-+          gt_use_preinstalled_gnugettext=yes
-+        else
-+          dnl Reset the values set by searching for libintl.
-+          LIBINTL=
-+          LTLIBINTL=
-+          INCINTL=
-+        fi
-+
-+    ifelse(gt_included_intl, yes, [
-+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-+          dnl GNU gettext is not found in the C library.
-+          dnl Fall back on included GNU gettext library.
-+          nls_cv_use_gnu_gettext=yes
-+        fi
-+      fi
-+
-+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-+        dnl Mark actions used to generate GNU NLS library.
-+        INTLOBJS="\$(GETTOBJS)"
-+        BUILD_INCLUDED_LIBINTL=yes
-+        USE_INCLUDED_LIBINTL=yes
-+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-+      fi
-+
-+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+        dnl Mark actions to use GNU gettext tools.
-+        CATOBJEXT=.gmo
-+      fi
-+    ])
-+
-+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+      AC_DEFINE(ENABLE_NLS, 1,
-+        [Define to 1 if translation of program messages to the user's native language
-+   is requested.])
-+    else
-+      USE_NLS=no
-+    fi
-+  fi
-+
-+  if test "$USE_NLS" = "yes"; then
-+
-+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-+        AC_MSG_CHECKING([how to link with libintl])
-+        AC_MSG_RESULT([$LIBINTL])
-+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-+      fi
-+
-+      dnl For backward compatibility. Some packages may be using this.
-+      AC_DEFINE(HAVE_GETTEXT, 1,
-+       [Define if the GNU gettext() function is already present or preinstalled.])
-+      AC_DEFINE(HAVE_DCGETTEXT, 1,
-+       [Define if the GNU dcgettext() function is already present or preinstalled.])
-+    fi
-+
-+    dnl We need to process the po/ directory.
-+    POSUB=po
-+  fi
-+
-+  ifelse(gt_included_intl, yes, [
-+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-+    dnl to 'yes' because some of the testsuite requires it.
-+    if test "$PACKAGE" = gettext; then
-+      BUILD_INCLUDED_LIBINTL=yes
-+    fi
-+
-+    dnl Make all variables we use known to autoconf.
-+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-+    AC_SUBST(USE_INCLUDED_LIBINTL)
-+    AC_SUBST(CATOBJEXT)
-+    AC_SUBST(INTLOBJS)
-+
-+    dnl For backward compatibility. Some configure.ins may be using this.
-+    nls_cv_header_intl=
-+    nls_cv_header_libgt=
-+
-+    dnl For backward compatibility. Some Makefiles may be using this.
-+    DATADIRNAME=share
-+    AC_SUBST(DATADIRNAME)
-+
-+    dnl For backward compatibility. Some Makefiles may be using this.
-+    INSTOBJEXT=.mo
-+    AC_SUBST(INSTOBJEXT)
-+
-+    dnl For backward compatibility. Some Makefiles may be using this.
-+    GENCAT=gencat
-+    AC_SUBST(GENCAT)
-+
-+    dnl Enable libtool support if the surrounding package wishes it.
-+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-+  ])
-+
-+  dnl For backward compatibility. Some Makefiles may be using this.
-+  INTLLIBS="$LIBINTL"
-+  AC_SUBST(INTLLIBS)
-+
-+  dnl Make all documented variables known to autoconf.
-+  AC_SUBST(LIBINTL)
-+  AC_SUBST(LTLIBINTL)
-+  AC_SUBST(POSUB)
-+])
-+
-+
-+dnl Checks for all prerequisites of the po subdirectory,
-+dnl except for USE_NLS.
-+AC_DEFUN([AM_PO_SUBDIRS],
-+[
-+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+  AC_REQUIRE([AC_PROG_INSTALL])dnl
-+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-+
-+  dnl Perform the following tests also if --disable-nls has been given,
-+  dnl because they are needed for "make dist" to work.
-+
-+  dnl Search for GNU msgfmt in the PATH.
-+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-+  dnl The second test excludes FreeBSD msgfmt.
-+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+    :)
-+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+
-+  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-+  dnl The second test excludes FreeBSD xgettext.
-+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-+    :)
-+  dnl Remove leftover from FreeBSD xgettext call.
-+  rm -f messages.po
-+
-+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-+
-+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-+  dnl Test whether we really found GNU msgfmt.
-+  if test "$GMSGFMT" != ":"; then
-+    dnl If it is no GNU msgfmt we define it as : so that the
-+    dnl Makefiles still can work.
-+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+      AC_MSG_RESULT(
-+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-+      GMSGFMT=":"
-+    fi
-+  fi
-+
-+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-+  dnl Test whether we really found GNU xgettext.
-+  if test "$XGETTEXT" != ":"; then
-+    dnl If it is no GNU xgettext we define it as : so that the
-+    dnl Makefiles still can work.
-+    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-+       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      AC_MSG_RESULT(
-+        [found xgettext program is not GNU xgettext; ignore it])
-+      XGETTEXT=":"
-+    fi
-+    dnl Remove leftover from FreeBSD xgettext call.
-+    rm -f messages.po
-+  fi
-+
-+  AC_OUTPUT_COMMANDS([
-+    for ac_file in $CONFIG_FILES; do
-+      # Support "outfile[:infile[:infile...]]"
-+      case "$ac_file" in
-+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+      esac
-+      # PO directories have a Makefile.in generated from Makefile.in.in.
-+      case "$ac_file" in */Makefile.in)
-+        # Adjust a relative srcdir.
-+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-+        # In autoconf-2.13 it is called $ac_given_srcdir.
-+        # In autoconf-2.50 it is called $srcdir.
-+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-+        case "$ac_given_srcdir" in
-+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-+          /*) top_srcdir="$ac_given_srcdir" ;;
-+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+        esac
-+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-+          rm -f "$ac_dir/POTFILES"
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-+          # on $ac_dir but don't depend on user-specified configuration
-+          # parameters.
-+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+            # The LINGUAS file contains the set of available languages.
-+            if test -n "$ALL_LINGUAS"; then
-+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+            fi
-+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+            # Hide the ALL_LINGUAS assigment from automake.
-+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+          fi
-+          case "$ac_given_srcdir" in
-+            .) srcdirpre= ;;
-+            *) srcdirpre='$(srcdir)/' ;;
-+          esac
-+          POFILES=
-+          GMOFILES=
-+          UPDATEPOFILES=
-+          DUMMYPOFILES=
-+          for lang in $ALL_LINGUAS; do
-+            POFILES="$POFILES $srcdirpre$lang.po"
-+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+          done
-+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+          # environment variable.
-+          INST_LINGUAS=
-+          if test -n "$ALL_LINGUAS"; then
-+            for presentlang in $ALL_LINGUAS; do
-+              useit=no
-+              if test "%UNSET%" != "$LINGUAS"; then
-+                desiredlanguages="$LINGUAS"
-+              else
-+                desiredlanguages="$ALL_LINGUAS"
-+              fi
-+              for desiredlang in $desiredlanguages; do
-+                # Use the presentlang catalog if desiredlang is
-+                #   a. equal to presentlang, or
-+                #   b. a variant of presentlang (because in this case,
-+                #      presentlang can be used as a fallback for messages
-+                #      which are not translated in the desiredlang catalog).
-+                case "$desiredlang" in
-+                  "$presentlang"*) useit=yes;;
-+                esac
-+              done
-+              if test $useit = yes; then
-+                INST_LINGUAS="$INST_LINGUAS $presentlang"
-+              fi
-+            done
-+          fi
-+          CATALOGS=
-+          if test -n "$INST_LINGUAS"; then
-+            for lang in $INST_LINGUAS; do
-+              CATALOGS="$CATALOGS $lang.gmo"
-+            done
-+          fi
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+            if test -f "$f"; then
-+              case "$f" in
-+                *.orig | *.bak | *~) ;;
-+                *) cat "$f" >> "$ac_dir/Makefile" ;;
-+              esac
-+            fi
-+          done
-+        fi
-+        ;;
-+      esac
-+    done],
-+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-+    # from automake.
-+    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+    LINGUAS="${LINGUAS-%UNSET%}"
-+   ])
-+])
-+
-+
-+dnl Checks for all prerequisites of the intl subdirectory,
-+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-+AC_DEFUN([AM_INTL_SUBDIR],
-+[
-+  AC_REQUIRE([AC_PROG_INSTALL])dnl
-+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-+  AC_REQUIRE([AC_PROG_CC])dnl
-+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+  AC_REQUIRE([AC_PROG_RANLIB])dnl
-+  AC_REQUIRE([AC_ISC_POSIX])dnl
-+  AC_REQUIRE([AC_HEADER_STDC])dnl
-+  AC_REQUIRE([AC_C_CONST])dnl
-+  AC_REQUIRE([AC_C_INLINE])dnl
-+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+  AC_REQUIRE([AC_FUNC_MMAP])dnl
-+  AC_REQUIRE([jm_GLIBC21])dnl
-+  AC_REQUIRE([gt_INTDIV0])dnl
-+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-+
-+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-+stdlib.h string.h unistd.h sys/param.h])
-+  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-+geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-+strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-+
-+  AM_ICONV
-+  AM_LANGINFO_CODESET
-+  if test $ac_cv_header_locale_h = yes; then
-+    AM_LC_MESSAGES
-+  fi
-+
-+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-+  dnl because plural.y uses bison specific features. It requires at least
-+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-+  dnl compile.
-+  dnl bison is only needed for the maintainer (who touches plural.y). But in
-+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-+  dnl the rule in general Makefile. Now, some people carelessly touch the
-+  dnl files or have a broken "make" program, hence the plural.c rule will
-+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-+  dnl present or too old.
-+  AC_CHECK_PROGS([INTLBISON], [bison])
-+  if test -z "$INTLBISON"; then
-+    ac_verc_fail=yes
-+  else
-+    dnl Found it, now check the version.
-+    AC_MSG_CHECKING([version of bison])
-+changequote(<<,>>)dnl
-+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+    case $ac_prog_version in
-+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-+changequote([,])dnl
-+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-+    esac
-+    AC_MSG_RESULT([$ac_prog_version])
-+  fi
-+  if test $ac_verc_fail = yes; then
-+    INTLBISON=:
-+  fi
-+])
-+
-+
-+AC_DEFUN([AM_MKINSTALLDIRS],
-+[
-+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-+  dnl Try to locate is.
-+  MKINSTALLDIRS=
-+  if test -n "$ac_aux_dir"; then
-+    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+  fi
-+  if test -z "$MKINSTALLDIRS"; then
-+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+  fi
-+  AC_SUBST(MKINSTALLDIRS)
-+])
-+
-+
-+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
---- /dev/null
-+++ atk-1.2.0/m4/glib-2.0.m4
-@@ -0,0 +1,212 @@
-+# Configure paths for GLIB
-+# Owen Taylor     1997-2001
-+
-+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-+dnl gthread is specified in MODULES, pass to pkg-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB_2_0,
-+[dnl 
-+dnl Get the cflags and libraries from pkg-config
-+dnl
-+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-+		    , enable_glibtest=yes)
-+
-+  pkg_config_args=glib-2.0
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gmodule) 
-+             pkg_config_args="$pkg_config_args gmodule-2.0"
-+         ;;
-+         gobject) 
-+             pkg_config_args="$pkg_config_args gobject-2.0"
-+         ;;
-+         gthread) 
-+             pkg_config_args="$pkg_config_args gthread-2.0"
-+         ;;
-+      esac
-+  done
-+
-+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
-+  no_glib=""
-+
-+  if test x$PKG_CONFIG != xno ; then
-+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-+      :
-+    else
-+      echo *** pkg-config too old; version 0.7 or better required.
-+      no_glib=yes
-+      PKG_CONFIG=no
-+    fi
-+  else
-+    no_glib=yes
-+  fi
-+
-+  min_glib_version=ifelse([$1], ,2.0.0,$1)
-+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+
-+  if test x$PKG_CONFIG != xno ; then
-+    ## don't try to run the test against uninstalled libtool libs
-+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-+	  enable_glibtest=no
-+    fi
-+
-+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-+	  :
-+    else
-+	  no_glib=yes
-+    fi
-+  fi
-+
-+  if test x"$no_glib" = x ; then
-+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+
-+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_glibtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+      LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of pkg-config to some extent)
-+dnl
-+      rm -f conf.glibtest
-+      AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.glibtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_glib_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_glib_version");
-+     exit(1);
-+   }
-+
-+  if ((glib_major_version != $glib_config_major_version) ||
-+      (glib_minor_version != $glib_config_minor_version) ||
-+      (glib_micro_version != $glib_config_micro_version))
-+    {
-+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+             glib_major_version, glib_minor_version, glib_micro_version);
-+      printf ("*** was found! If pkg-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-+      printf("*** to point to the correct configuration files\n");
-+    } 
-+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-+           (glib_micro_version != GLIB_MICRO_VERSION))
-+    {
-+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     glib_major_version, glib_minor_version, glib_micro_version);
-+    }
-+  else
-+    {
-+      if ((glib_major_version > major) ||
-+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+               glib_major_version, glib_minor_version, glib_micro_version);
-+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_glib" = x ; then
-+     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$PKG_CONFIG" = "no" ; then
-+       echo "*** A new enough version of pkg-config was not found."
-+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-+     else
-+       if test -f conf.glibtest ; then
-+        :
-+       else
-+          echo "*** Could not run GLIB test program, checking why..."
-+          ac_save_CFLAGS="$CFLAGS"
-+          ac_save_LIBS="$LIBS"
-+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+          LIBS="$LIBS $GLIB_LIBS"
-+          AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GLIB_CFLAGS=""
-+     GLIB_LIBS=""
-+     GLIB_GENMARSHAL=""
-+     GOBJECT_QUERY=""
-+     GLIB_MKENUMS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  AC_SUBST(GLIB_GENMARSHAL)
-+  AC_SUBST(GOBJECT_QUERY)
-+  AC_SUBST(GLIB_MKENUMS)
-+  rm -f conf.glibtest
-+])
---- /dev/null
-+++ atk-1.2.0/m4/glibc21.m4
-@@ -0,0 +1,32 @@
-+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# From Bruno Haible.
-+
-+AC_DEFUN([jm_GLIBC21],
-+  [
-+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-+      ac_cv_gnu_library_2_1,
-+      [AC_EGREP_CPP([Lucky GNU user],
-+	[
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-+  Lucky GNU user
-+ #endif
-+#endif
-+	],
-+	ac_cv_gnu_library_2_1=yes,
-+	ac_cv_gnu_library_2_1=no)
-+      ]
-+    )
-+    AC_SUBST(GLIBC21)
-+    GLIBC21="$ac_cv_gnu_library_2_1"
-+  ]
-+)
---- /dev/null
-+++ atk-1.2.0/m4/glib-gettext.m4
-@@ -0,0 +1,284 @@
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-+#
-+# Modified to never use included libintl. 
-+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-+#
-+#
-+# This file can be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+#
-+#
-+# If you make changes to this file, you MUST update the copy in
-+# acinclude.m4. [ aclocal dies on duplicate macros, so if
-+# we run 'aclocal -I macros/' then we'll run into problems
-+# once we've installed glib-gettext.m4 :-( ]
-+#
-+
-+AC_DEFUN([AM_GLIB_LC_MESSAGES],
-+  [if test $ac_cv_header_locale_h = yes; then
-+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+    if test $am_cv_val_LC_MESSAGES = yes; then
-+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+        [Define if your <locale.h> file defines LC_MESSAGES.])
-+    fi
-+  fi])
-+
-+dnl AM_GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_GLIB_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
-+
-+# serial 5
-+
-+AC_DEFUN(AM_GLIB_WITH_NLS,
-+  dnl NLS is obligatory
-+  [USE_NLS=yes
-+    AC_SUBST(USE_NLS)
-+
-+    dnl Figure out what method
-+    nls_cv_force_use_gnu_gettext="no"
-+
-+    nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+    if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+      dnl User does not insist on using GNU NLS library.  Figure out what
-+      dnl to use.  If gettext or catgets are available (in this order) we
-+      dnl use this.  Else we have to fall back to GNU NLS library.
-+      dnl catgets is only used if permitted by option --with-catgets.
-+      nls_cv_header_intl=
-+      nls_cv_header_libgt=
-+      CATOBJEXT=NONE
-+      XGETTEXT=:
-+
-+      AC_CHECK_HEADER(libintl.h,
-+        [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+	  [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
-+	    gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
-+
-+          gt_cv_func_dgettext_libintl="no"
-+          libintl_extra_libs=""
-+
-+	  if test "$gt_cv_func_dgettext_libc" != "yes" ; then
-+	    AC_CHECK_LIB(intl, bindtextdomain,
-+              [AC_CHECK_LIB(intl, dgettext,
-+                            gt_cv_func_dgettext_libintl=yes)])
-+
-+	    if test "$gt_cv_func_dgettext_libc" != "yes" ; then
-+              AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+              AC_MSG_RESULT([])
-+              AC_CHECK_LIB(intl, dcgettext,
-+                           [gt_cv_func_dgettext_libintl=yes
-+                            libintl_extra_libs=-liconv],
-+                           :,-liconv)
-+            fi
-+          fi
-+
-+          if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    LIBS="$LIBS -lintl $libintl_extra_libs";
-+          fi
-+
-+	  if test "$gt_cv_func_dgettext_libc" = "yes" \
-+	    || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    AC_DEFINE(HAVE_GETTEXT,1,
-+              [Define if the GNU gettext() function is already present or preinstalled.])
-+	    AM_GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ 	      [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+	    if test "$MSGFMT" != "no"; then
-+	      AC_CHECK_FUNCS(dcgettext)
-+	      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+	      AM_GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+	        [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+	      AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+		 	     return _nl_msg_cat_cntr],
-+	        [CATOBJEXT=.gmo
-+	         DATADIRNAME=share],
-+	        [CATOBJEXT=.mo
-+	         DATADIRNAME=lib])
-+	      INSTOBJEXT=.mo
-+	    fi
-+	  fi
-+
-+	  # Added by Martin Baulig 12/15/98 for libc5 systems
-+	  if test "$gt_cv_func_dgettext_libc" != "yes" \
-+	    && test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	    INTLLIBS="-lintl $libintl_extra_libs"
-+	    LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-+	  fi
-+      ])
-+
-+      if test "$CATOBJEXT" = "NONE"; then
-+        dnl Neither gettext nor catgets in included in the C library.
-+        dnl Fall back on GNU gettext library.
-+        nls_cv_use_gnu_gettext=yes
-+      fi
-+    fi
-+
-+    if test "$nls_cv_use_gnu_gettext" != "yes"; then
-+      AC_DEFINE(ENABLE_NLS, 1,
-+        [always defined to indicate that i18n is enabled])
-+    else
-+      dnl Unset this variable since we use the non-zero value as a flag.
-+      CATOBJEXT=
-+    fi
-+
-+    dnl Test whether we really found GNU xgettext.
-+    if test "$XGETTEXT" != ":"; then
-+      dnl If it is no GNU xgettext we define it as : so that the
-+      dnl Makefiles still can work.
-+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+        : ;
-+      else
-+        AC_MSG_RESULT(
-+	  [found xgettext program is not GNU xgettext; ignore it])
-+        XGETTEXT=":"
-+      fi
-+    fi
-+
-+    # We need to process the po/ directory.
-+    POSUB=po
-+
-+    AC_OUTPUT_COMMANDS(
-+      [case "$CONFIG_FILES" in *po/Makefile.in*)
-+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+      esac])
-+
-+    dnl These rules are solely for the distribution goal.  While doing this
-+    dnl we only have to keep exactly one list of the available catalogs
-+    dnl in configure.in.
-+    for lang in $ALL_LINGUAS; do
-+      GMOFILES="$GMOFILES $lang.gmo"
-+      POFILES="$POFILES $lang.po"
-+    done
-+
-+    dnl Make all variables we use known to autoconf.
-+    AC_SUBST(CATALOGS)
-+    AC_SUBST(CATOBJEXT)
-+    AC_SUBST(DATADIRNAME)
-+    AC_SUBST(GMOFILES)
-+    AC_SUBST(INSTOBJEXT)
-+    AC_SUBST(INTLDEPS)
-+    AC_SUBST(INTLLIBS)
-+    AC_SUBST(INTLOBJS)
-+    AC_SUBST(POFILES)
-+    AC_SUBST(POSUB)
-+  ])
-+
-+AC_DEFUN(AM_GLIB_GNU_GETTEXT,
-+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+   AC_REQUIRE([AC_PROG_CC])dnl
-+   AC_REQUIRE([AC_PROG_RANLIB])dnl
-+   AC_REQUIRE([AC_HEADER_STDC])dnl
-+   AC_REQUIRE([AC_C_CONST])dnl
-+   AC_REQUIRE([AC_C_INLINE])dnl
-+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+   AC_REQUIRE([AC_FUNC_MMAP])dnl
-+
-+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-+unistd.h sys/param.h])
-+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-+strdup __argz_count __argz_stringify __argz_next])
-+
-+   AM_GLIB_LC_MESSAGES
-+   AM_GLIB_WITH_NLS
-+
-+   if test "x$CATOBJEXT" != "x"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       AC_MSG_CHECKING(for catalogs to be installed)
-+       NEW_LINGUAS=
-+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-+         case "$ALL_LINGUAS" in
-+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+         esac
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       AC_MSG_RESULT($LINGUAS)
-+     fi
-+
-+     dnl Construct list of names of catalog files to be constructed.
-+     if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
-+
-+   dnl Determine which catalog format we have (if any is needed)
-+   dnl For now we know about two different formats:
-+   dnl   Linux libc-5 and the normal X/Open format
-+   test -d po || mkdir po
-+   if test "$CATOBJEXT" = ".cat"; then
-+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-+
-+     dnl Transform the SED scripts while copying because some dumb SEDs
-+     dnl cannot handle comments.
-+     sed -e '/^#/d' $srcdir/po/$msgformat-msg.sed > po/po2msg.sed
-+   fi
-+
-+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+   dnl Try to locate is.
-+   MKINSTALLDIRS=
-+   if test -n "$ac_aux_dir"; then
-+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+   fi
-+   if test -z "$MKINSTALLDIRS"; then
-+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+   fi
-+   AC_SUBST(MKINSTALLDIRS)
-+
-+   dnl Generate list of files to be processed by xgettext which will
-+   dnl be included in po/Makefile.
-+   test -d po || mkdir po
-+   if test "x$srcdir" != "x."; then
-+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+       posrcprefix="$srcdir/"
-+     else
-+       posrcprefix="../$srcdir/"
-+     fi
-+   else
-+     posrcprefix="../"
-+   fi
-+   rm -f po/POTFILES
-+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+	< $srcdir/po/POTFILES.in > po/POTFILES
-+  ])
-+
---- /dev/null
-+++ atk-1.2.0/m4/iconv.m4
-@@ -0,0 +1,103 @@
-+# iconv.m4 serial AM4 (gettext-0.11.3)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-+[
-+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+
-+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+  dnl accordingly.
-+  AC_LIB_LINKFLAGS_BODY([iconv])
-+])
-+
-+AC_DEFUN([AM_ICONV_LINK],
-+[
-+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-+  dnl those with the standalone portable GNU libiconv installed).
-+
-+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-+  dnl accordingly.
-+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+
-+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-+  dnl because if the user has installed libiconv and not disabled its use
-+  dnl via --without-libiconv-prefix, he wants to use it. The first
-+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-+  am_save_CPPFLAGS="$CPPFLAGS"
-+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-+
-+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-+    am_cv_func_iconv="no, consider installing GNU libiconv"
-+    am_cv_lib_iconv=no
-+    AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+      [iconv_t cd = iconv_open("","");
-+       iconv(cd,NULL,NULL,NULL,NULL);
-+       iconv_close(cd);],
-+      am_cv_func_iconv=yes)
-+    if test "$am_cv_func_iconv" != yes; then
-+      am_save_LIBS="$LIBS"
-+      LIBS="$LIBS $LIBICONV"
-+      AC_TRY_LINK([#include <stdlib.h>
-+#include <iconv.h>],
-+        [iconv_t cd = iconv_open("","");
-+         iconv(cd,NULL,NULL,NULL,NULL);
-+         iconv_close(cd);],
-+        am_cv_lib_iconv=yes
-+        am_cv_func_iconv=yes)
-+      LIBS="$am_save_LIBS"
-+    fi
-+  ])
-+  if test "$am_cv_func_iconv" = yes; then
-+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-+  fi
-+  if test "$am_cv_lib_iconv" = yes; then
-+    AC_MSG_CHECKING([how to link with libiconv])
-+    AC_MSG_RESULT([$LIBICONV])
-+  else
-+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-+    dnl either.
-+    CPPFLAGS="$am_save_CPPFLAGS"
-+    LIBICONV=
-+    LTLIBICONV=
-+  fi
-+  AC_SUBST(LIBICONV)
-+  AC_SUBST(LTLIBICONV)
-+])
-+
-+AC_DEFUN([AM_ICONV],
-+[
-+  AM_ICONV_LINK
-+  if test "$am_cv_func_iconv" = yes; then
-+    AC_MSG_CHECKING([for iconv declaration])
-+    AC_CACHE_VAL(am_cv_proto_iconv, [
-+      AC_TRY_COMPILE([
-+#include <stdlib.h>
-+#include <iconv.h>
-+extern
-+#ifdef __cplusplus
-+"C"
-+#endif
-+#if defined(__STDC__) || defined(__cplusplus)
-+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-+#else
-+size_t iconv();
-+#endif
-+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-+    AC_MSG_RESULT([$]{ac_t:-
-+         }[$]am_cv_proto_iconv)
-+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-+      [Define as const if the declaration of iconv() needs const.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/intdiv0.m4
-@@ -0,0 +1,72 @@
-+# intdiv0.m4 serial 1 (gettext-0.11.3)
-+dnl Copyright (C) 2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([gt_INTDIV0],
-+[
-+  AC_REQUIRE([AC_PROG_CC])dnl
-+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-+    gt_cv_int_divbyzero_sigfpe,
-+    [
-+      AC_TRY_RUN([
-+#include <stdlib.h>
-+#include <signal.h>
-+
-+static void
-+#ifdef __cplusplus
-+sigfpe_handler (int sig)
-+#else
-+sigfpe_handler (sig) int sig;
-+#endif
-+{
-+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-+  exit (sig != SIGFPE);
-+}
-+
-+int x = 1;
-+int y = 0;
-+int z;
-+int nan;
-+
-+int main ()
-+{
-+  signal (SIGFPE, sigfpe_handler);
-+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-+  signal (SIGTRAP, sigfpe_handler);
-+#endif
-+/* Linux/SPARC yields signal SIGILL.  */
-+#if defined (__sparc__) && defined (__linux__)
-+  signal (SIGILL, sigfpe_handler);
-+#endif
-+
-+  z = x / y;
-+  nan = y / y;
-+  exit (1);
-+}
-+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-+        [
-+          # Guess based on the CPU.
-+          case "$host_cpu" in
-+            alpha* | i[34567]86 | m68k | s390*)
-+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-+            *)
-+              gt_cv_int_divbyzero_sigfpe="guessing no";;
-+          esac
-+        ])
-+    ])
-+  case "$gt_cv_int_divbyzero_sigfpe" in
-+    *yes) value=1;;
-+    *) value=0;;
-+  esac
-+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-+    [Define if integer division by zero raises signal SIGFPE.])
-+])
---- /dev/null
-+++ atk-1.2.0/m4/inttypes_h.m4
-@@ -0,0 +1,28 @@
-+# inttypes_h.m4 serial 4 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-+[
-+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-+  [AC_TRY_COMPILE(
-+    [#include <sys/types.h>
-+#include <inttypes.h>],
-+    [uintmax_t i = (uintmax_t) -1;],
-+    jm_ac_cv_header_inttypes_h=yes,
-+    jm_ac_cv_header_inttypes_h=no)])
-+  if test $jm_ac_cv_header_inttypes_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-+   and declares uintmax_t. ])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/inttypes.m4
-@@ -0,0 +1,27 @@
-+# inttypes.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-+# <sys/types.h>.
-+
-+AC_DEFUN([gt_HEADER_INTTYPES_H],
-+[
-+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-+  [
-+    AC_TRY_COMPILE(
-+      [#include <sys/types.h>
-+#include <inttypes.h>],
-+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-+  ])
-+  if test $gt_cv_header_inttypes_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/inttypes-pri.m4
-@@ -0,0 +1,32 @@
-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-+# macros to non-string values.  This is the case on AIX 4.3.3.
-+
-+AC_DEFUN([gt_INTTYPES_PRI],
-+[
-+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-+  if test $gt_cv_header_inttypes_h = yes; then
-+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-+      gt_cv_inttypes_pri_broken,
-+      [
-+        AC_TRY_COMPILE([#include <inttypes.h>
-+#ifdef PRId32
-+char *p = PRId32;
-+#endif
-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-+      ])
-+  fi
-+  if test "$gt_cv_inttypes_pri_broken" = yes; then
-+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/isc-posix.m4
-@@ -0,0 +1,26 @@
-+# isc-posix.m4 serial 2 (gettext-0.11.2)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-+
-+# This test replaces the one in autoconf.
-+# Currently this macro should have the same name as the autoconf macro
-+# because gettext's gettext.m4 (distributed in the automake package)
-+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-+# give these diagnostics:
-+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-+
-+undefine([AC_ISC_POSIX])
-+
-+AC_DEFUN([AC_ISC_POSIX],
-+  [
-+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-+  ]
-+)
---- /dev/null
-+++ atk-1.2.0/m4/lcmessage.m4
-@@ -0,0 +1,32 @@
-+# lcmessage.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+[
-+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+  if test $am_cv_val_LC_MESSAGES = yes; then
-+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+      [Define if your <locale.h> file defines LC_MESSAGES.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/lib-ld.m4
-@@ -0,0 +1,97 @@
-+# lib-ld.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl Subroutines of libtool.m4,
-+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-+dnl with libtool.m4.
-+
-+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-+AC_DEFUN([AC_LIB_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  acl_cv_prog_gnu_ld=yes
-+else
-+  acl_cv_prog_gnu_ld=no
-+fi])
-+with_gnu_ld=$acl_cv_prog_gnu_ld
-+])
-+
-+dnl From libtool-1.4. Sets the variable LD.
-+AC_DEFUN([AC_LIB_PROG_LD],
-+[AC_ARG_WITH(gnu-ld,
-+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by GCC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]* | [A-Za-z]:[\\/]*)]
-+      [re_direlt='/[^/][^/]*/\.\./']
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(acl_cv_path_LD,
-+[if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      acl_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$acl_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_LIB_PROG_LD_GNU
-+])
---- /dev/null
-+++ atk-1.2.0/m4/lib-link.m4
-@@ -0,0 +1,554 @@
-+# lib-link.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-+dnl augments the CPPFLAGS variable.
-+AC_DEFUN([AC_LIB_LINKFLAGS],
-+[
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+  define([Name],[translit([$1],[./-], [___])])
-+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-+  ])
-+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+  AC_SUBST([LIB]NAME)
-+  AC_SUBST([LTLIB]NAME)
-+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-+  dnl results of this search when this library appears as a dependency.
-+  HAVE_LIB[]NAME=yes
-+  undefine([Name])
-+  undefine([NAME])
-+])
-+
-+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-+dnl searches for libname and the libraries corresponding to explicit and
-+dnl implicit dependencies, together with the specified include files and
-+dnl the ability to compile and link the specified testcode. If found, it
-+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-+[
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+  define([Name],[translit([$1],[./-], [___])])
-+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+
-+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-+  dnl accordingly.
-+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-+
-+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-+  dnl because if the user has installed lib[]Name and not disabled its use
-+  dnl via --without-lib[]Name-prefix, he wants to use it.
-+  ac_save_CPPFLAGS="$CPPFLAGS"
-+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-+
-+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-+    ac_save_LIBS="$LIBS"
-+    LIBS="$LIBS $LIB[]NAME"
-+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-+    LIBS="$ac_save_LIBS"
-+  ])
-+  if test "$ac_cv_lib[]Name" = yes; then
-+    HAVE_LIB[]NAME=yes
-+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-+    AC_MSG_CHECKING([how to link with lib[]$1])
-+    AC_MSG_RESULT([$LIB[]NAME])
-+  else
-+    HAVE_LIB[]NAME=no
-+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-+    dnl $INC[]NAME either.
-+    CPPFLAGS="$ac_save_CPPFLAGS"
-+    LIB[]NAME=
-+    LTLIB[]NAME=
-+  fi
-+  AC_SUBST([HAVE_LIB]NAME)
-+  AC_SUBST([LIB]NAME)
-+  AC_SUBST([LTLIB]NAME)
-+  undefine([Name])
-+  undefine([NAME])
-+])
-+
-+dnl Determine the platform dependent parameters needed to use rpath:
-+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-+dnl hardcode_direct, hardcode_minus_L,
-+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-+AC_DEFUN([AC_LIB_RPATH],
-+[
-+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-+    . ./conftest.sh
-+    rm -f ./conftest.sh
-+    acl_cv_rpath=done
-+  ])
-+  wl="$acl_cv_wl"
-+  libext="$acl_cv_libext"
-+  shlibext="$acl_cv_shlibext"
-+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-+  hardcode_direct="$acl_cv_hardcode_direct"
-+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-+  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-+  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-+  dnl Determine whether the user wants rpath handling at all.
-+  AC_ARG_ENABLE(rpath,
-+    [  --disable-rpath         do not hardcode runtime library paths],
-+    :, enable_rpath=yes)
-+])
-+
-+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-+dnl the libraries corresponding to explicit and implicit dependencies.
-+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-+[
-+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-+  dnl By default, look in $includedir and $libdir.
-+  use_additional=yes
-+  AC_LIB_WITH_FINAL_PREFIX([
-+    eval additional_includedir=\"$includedir\"
-+    eval additional_libdir=\"$libdir\"
-+  ])
-+  AC_ARG_WITH([lib$1-prefix],
-+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-+[
-+    if test "X$withval" = "Xno"; then
-+      use_additional=no
-+    else
-+      if test "X$withval" = "X"; then
-+        AC_LIB_WITH_FINAL_PREFIX([
-+          eval additional_includedir=\"$includedir\"
-+          eval additional_libdir=\"$libdir\"
-+        ])
-+      else
-+        additional_includedir="$withval/include"
-+        additional_libdir="$withval/lib"
-+      fi
-+    fi
-+])
-+  dnl Search the library and its dependencies in $additional_libdir and
-+  dnl $LDFLAGS. Using breadth-first-seach.
-+  LIB[]NAME=
-+  LTLIB[]NAME=
-+  INC[]NAME=
-+  rpathdirs=
-+  ltrpathdirs=
-+  names_already_handled=
-+  names_next_round='$1 $2'
-+  while test -n "$names_next_round"; do
-+    names_this_round="$names_next_round"
-+    names_next_round=
-+    for name in $names_this_round; do
-+      already_handled=
-+      for n in $names_already_handled; do
-+        if test "$n" = "$name"; then
-+          already_handled=yes
-+          break
-+        fi
-+      done
-+      if test -z "$already_handled"; then
-+        names_already_handled="$names_already_handled $name"
-+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-+        dnl or AC_LIB_HAVE_LINKFLAGS call.
-+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-+        eval value=\"\$HAVE_LIB$uppername\"
-+        if test -n "$value"; then
-+          if test "$value" = yes; then
-+            eval value=\"\$LIB$uppername\"
-+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-+            eval value=\"\$LTLIB$uppername\"
-+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-+          else
-+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-+            dnl that this library doesn't exist. So just drop it.
-+            :
-+          fi
-+        else
-+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-+          found_dir=
-+          found_la=
-+          found_so=
-+          found_a=
-+          if test $use_additional = yes; then
-+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+              found_dir="$additional_libdir"
-+              found_so="$additional_libdir/lib$name.$shlibext"
-+              if test -f "$additional_libdir/lib$name.la"; then
-+                found_la="$additional_libdir/lib$name.la"
-+              fi
-+            else
-+              if test -f "$additional_libdir/lib$name.$libext"; then
-+                found_dir="$additional_libdir"
-+                found_a="$additional_libdir/lib$name.$libext"
-+                if test -f "$additional_libdir/lib$name.la"; then
-+                  found_la="$additional_libdir/lib$name.la"
-+                fi
-+              fi
-+            fi
-+          fi
-+          if test "X$found_dir" = "X"; then
-+            for x in $LDFLAGS $LTLIB[]NAME; do
-+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+              case "$x" in
-+                -L*)
-+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-+                    found_dir="$dir"
-+                    found_so="$dir/lib$name.$shlibext"
-+                    if test -f "$dir/lib$name.la"; then
-+                      found_la="$dir/lib$name.la"
-+                    fi
-+                  else
-+                    if test -f "$dir/lib$name.$libext"; then
-+                      found_dir="$dir"
-+                      found_a="$dir/lib$name.$libext"
-+                      if test -f "$dir/lib$name.la"; then
-+                        found_la="$dir/lib$name.la"
-+                      fi
-+                    fi
-+                  fi
-+                  ;;
-+              esac
-+              if test "X$found_dir" != "X"; then
-+                break
-+              fi
-+            done
-+          fi
-+          if test "X$found_dir" != "X"; then
-+            dnl Found the library.
-+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-+            if test "X$found_so" != "X"; then
-+              dnl Linking with a shared library. We attempt to hardcode its
-+              dnl directory into the executable's runpath, unless it's the
-+              dnl standard /usr/lib.
-+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-+                dnl No hardcoding is needed.
-+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+              else
-+                dnl Use an explicit option to hardcode DIR into the resulting
-+                dnl binary.
-+                dnl Potentially add DIR to ltrpathdirs.
-+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+                haveit=
-+                for x in $ltrpathdirs; do
-+                  if test "X$x" = "X$found_dir"; then
-+                    haveit=yes
-+                    break
-+                  fi
-+                done
-+                if test -z "$haveit"; then
-+                  ltrpathdirs="$ltrpathdirs $found_dir"
-+                fi
-+                dnl The hardcoding into $LIBNAME is system dependent.
-+                if test "$hardcode_direct" = yes; then
-+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-+                  dnl resulting binary.
-+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+                else
-+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-+                    dnl Use an explicit option to hardcode DIR into the resulting
-+                    dnl binary.
-+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+                    dnl Potentially add DIR to rpathdirs.
-+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-+                    haveit=
-+                    for x in $rpathdirs; do
-+                      if test "X$x" = "X$found_dir"; then
-+                        haveit=yes
-+                        break
-+                      fi
-+                    done
-+                    if test -z "$haveit"; then
-+                      rpathdirs="$rpathdirs $found_dir"
-+                    fi
-+                  else
-+                    dnl Rely on "-L$found_dir".
-+                    dnl But don't add it if it's already contained in the LDFLAGS
-+                    dnl or the already constructed $LIBNAME
-+                    haveit=
-+                    for x in $LDFLAGS $LIB[]NAME; do
-+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                      if test "X$x" = "X-L$found_dir"; then
-+                        haveit=yes
-+                        break
-+                      fi
-+                    done
-+                    if test -z "$haveit"; then
-+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-+                    fi
-+                    if test "$hardcode_minus_L" != no; then
-+                      dnl FIXME: Not sure whether we should use
-+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+                      dnl here.
-+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-+                    else
-+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-+                      dnl here, because this doesn't fit in flags passed to the
-+                      dnl compiler. So give up. No hardcoding. This affects only
-+                      dnl very old systems.
-+                      dnl FIXME: Not sure whether we should use
-+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-+                      dnl here.
-+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+                    fi
-+                  fi
-+                fi
-+              fi
-+            else
-+              if test "X$found_a" != "X"; then
-+                dnl Linking with a static library.
-+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-+              else
-+                dnl We shouldn't come here, but anyway it's good to have a
-+                dnl fallback.
-+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-+              fi
-+            fi
-+            dnl Assume the include files are nearby.
-+            additional_includedir=
-+            case "$found_dir" in
-+              */lib | */lib/)
-+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-+                additional_includedir="$basedir/include"
-+                ;;
-+            esac
-+            if test "X$additional_includedir" != "X"; then
-+              dnl Potentially add $additional_includedir to $INCNAME.
-+              dnl But don't add it
-+              dnl   1. if it's the standard /usr/include,
-+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-+              dnl   3. if it's already present in $CPPFLAGS or the already
-+              dnl      constructed $INCNAME,
-+              dnl   4. if it doesn't exist as a directory.
-+              if test "X$additional_includedir" != "X/usr/include"; then
-+                haveit=
-+                if test "X$additional_includedir" = "X/usr/local/include"; then
-+                  if test -n "$GCC"; then
-+                    case $host_os in
-+                      linux*) haveit=yes;;
-+                    esac
-+                  fi
-+                fi
-+                if test -z "$haveit"; then
-+                  for x in $CPPFLAGS $INC[]NAME; do
-+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                    if test "X$x" = "X-I$additional_includedir"; then
-+                      haveit=yes
-+                      break
-+                    fi
-+                  done
-+                  if test -z "$haveit"; then
-+                    if test -d "$additional_includedir"; then
-+                      dnl Really add $additional_includedir to $INCNAME.
-+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-+                    fi
-+                  fi
-+                fi
-+              fi
-+            fi
-+            dnl Look for dependencies.
-+            if test -n "$found_la"; then
-+              dnl Read the .la file. It defines the variables
-+              dnl dlname, library_names, old_library, dependency_libs, current,
-+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-+              save_libdir="$libdir"
-+              case "$found_la" in
-+                */* | *\\*) . "$found_la" ;;
-+                *) . "./$found_la" ;;
-+              esac
-+              libdir="$save_libdir"
-+              dnl We use only dependency_libs.
-+              for dep in $dependency_libs; do
-+                case "$dep" in
-+                  -L*)
-+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-+                    dnl But don't add it
-+                    dnl   1. if it's the standard /usr/lib,
-+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-+                    dnl   3. if it's already present in $LDFLAGS or the already
-+                    dnl      constructed $LIBNAME,
-+                    dnl   4. if it doesn't exist as a directory.
-+                    if test "X$additional_libdir" != "X/usr/lib"; then
-+                      haveit=
-+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-+                        if test -n "$GCC"; then
-+                          case $host_os in
-+                            linux*) haveit=yes;;
-+                          esac
-+                        fi
-+                      fi
-+                      if test -z "$haveit"; then
-+                        haveit=
-+                        for x in $LDFLAGS $LIB[]NAME; do
-+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                          if test "X$x" = "X-L$additional_libdir"; then
-+                            haveit=yes
-+                            break
-+                          fi
-+                        done
-+                        if test -z "$haveit"; then
-+                          if test -d "$additional_libdir"; then
-+                            dnl Really add $additional_libdir to $LIBNAME.
-+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-+                          fi
-+                        fi
-+                        haveit=
-+                        for x in $LDFLAGS $LTLIB[]NAME; do
-+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+                          if test "X$x" = "X-L$additional_libdir"; then
-+                            haveit=yes
-+                            break
-+                          fi
-+                        done
-+                        if test -z "$haveit"; then
-+                          if test -d "$additional_libdir"; then
-+                            dnl Really add $additional_libdir to $LTLIBNAME.
-+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-+                          fi
-+                        fi
-+                      fi
-+                    fi
-+                    ;;
-+                  -R*)
-+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-+                    if test "$enable_rpath" != no; then
-+                      dnl Potentially add DIR to rpathdirs.
-+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-+                      haveit=
-+                      for x in $rpathdirs; do
-+                        if test "X$x" = "X$dir"; then
-+                          haveit=yes
-+                          break
-+                        fi
-+                      done
-+                      if test -z "$haveit"; then
-+                        rpathdirs="$rpathdirs $dir"
-+                      fi
-+                      dnl Potentially add DIR to ltrpathdirs.
-+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-+                      haveit=
-+                      for x in $ltrpathdirs; do
-+                        if test "X$x" = "X$dir"; then
-+                          haveit=yes
-+                          break
-+                        fi
-+                      done
-+                      if test -z "$haveit"; then
-+                        ltrpathdirs="$ltrpathdirs $dir"
-+                      fi
-+                    fi
-+                    ;;
-+                  -l*)
-+                    dnl Handle this in the next round.
-+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-+                    ;;
-+                  *.la)
-+                    dnl Handle this in the next round. Throw away the .la's
-+                    dnl directory; it is already contained in a preceding -L
-+                    dnl option.
-+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-+                    ;;
-+                  *)
-+                    dnl Most likely an immediate library name.
-+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-+                    ;;
-+                esac
-+              done
-+            fi
-+          else
-+            dnl Didn't find the library; assume it is in the system directories
-+            dnl known to the linker and runtime loader. (All the system
-+            dnl directories known to the linker should also be known to the
-+            dnl runtime loader, otherwise the system is severely misconfigured.)
-+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-+          fi
-+        fi
-+      fi
-+    done
-+  done
-+  if test "X$rpathdirs" != "X"; then
-+    if test -n "$hardcode_libdir_separator"; then
-+      dnl Weird platform: only the last -rpath option counts, the user must
-+      dnl pass all path elements in one option. We can arrange that for a
-+      dnl single library, but not when more than one $LIBNAMEs are used.
-+      alldirs=
-+      for found_dir in $rpathdirs; do
-+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-+      done
-+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-+      acl_save_libdir="$libdir"
-+      libdir="$alldirs"
-+      eval flag=\"$hardcode_libdir_flag_spec\"
-+      libdir="$acl_save_libdir"
-+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+    else
-+      dnl The -rpath options are cumulative.
-+      for found_dir in $rpathdirs; do
-+        acl_save_libdir="$libdir"
-+        libdir="$found_dir"
-+        eval flag=\"$hardcode_libdir_flag_spec\"
-+        libdir="$acl_save_libdir"
-+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-+      done
-+    fi
-+  fi
-+  if test "X$ltrpathdirs" != "X"; then
-+    dnl When using libtool, the option that works for both libraries and
-+    dnl executables is -R. The -R options are cumulative.
-+    for found_dir in $ltrpathdirs; do
-+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-+    done
-+  fi
-+])
-+
-+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-+dnl unless already present in VAR.
-+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-+dnl contains two or three consecutive elements that belong together.
-+AC_DEFUN([AC_LIB_APPENDTOVAR],
-+[
-+  for element in [$2]; do
-+    haveit=
-+    for x in $[$1]; do
-+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+      if test "X$x" = "X$element"; then
-+        haveit=yes
-+        break
-+      fi
-+    done
-+    if test -z "$haveit"; then
-+      [$1]="${[$1]}${[$1]:+ }$element"
-+    fi
-+  done
-+])
---- /dev/null
-+++ atk-1.2.0/m4/lib-prefix.m4
-@@ -0,0 +1,148 @@
-+# lib-prefix.m4 serial 1 (gettext-0.11)
-+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-+dnl to access previously installed libraries. The basic assumption is that
-+dnl a user will want packages to use other packages he previously installed
-+dnl with the same --prefix option.
-+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-+dnl libraries, but is otherwise very convenient.
-+AC_DEFUN([AC_LIB_PREFIX],
-+[
-+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-+  AC_REQUIRE([AC_PROG_CC])
-+  AC_REQUIRE([AC_CANONICAL_HOST])
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  dnl By default, look in $includedir and $libdir.
-+  use_additional=yes
-+  AC_LIB_WITH_FINAL_PREFIX([
-+    eval additional_includedir=\"$includedir\"
-+    eval additional_libdir=\"$libdir\"
-+  ])
-+  AC_ARG_WITH([lib-prefix],
-+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-+  --without-lib-prefix    don't search for libraries in includedir and libdir],
-+[
-+    if test "X$withval" = "Xno"; then
-+      use_additional=no
-+    else
-+      if test "X$withval" = "X"; then
-+        AC_LIB_WITH_FINAL_PREFIX([
-+          eval additional_includedir=\"$includedir\"
-+          eval additional_libdir=\"$libdir\"
-+        ])
-+      else
-+        additional_includedir="$withval/include"
-+        additional_libdir="$withval/lib"
-+      fi
-+    fi
-+])
-+  if test $use_additional = yes; then
-+    dnl Potentially add $additional_includedir to $CPPFLAGS.
-+    dnl But don't add it
-+    dnl   1. if it's the standard /usr/include,
-+    dnl   2. if it's already present in $CPPFLAGS,
-+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-+    dnl   4. if it doesn't exist as a directory.
-+    if test "X$additional_includedir" != "X/usr/include"; then
-+      haveit=
-+      for x in $CPPFLAGS; do
-+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+        if test "X$x" = "X-I$additional_includedir"; then
-+          haveit=yes
-+          break
-+        fi
-+      done
-+      if test -z "$haveit"; then
-+        if test "X$additional_includedir" = "X/usr/local/include"; then
-+          if test -n "$GCC"; then
-+            case $host_os in
-+              linux*) haveit=yes;;
-+            esac
-+          fi
-+        fi
-+        if test -z "$haveit"; then
-+          if test -d "$additional_includedir"; then
-+            dnl Really add $additional_includedir to $CPPFLAGS.
-+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-+          fi
-+        fi
-+      fi
-+    fi
-+    dnl Potentially add $additional_libdir to $LDFLAGS.
-+    dnl But don't add it
-+    dnl   1. if it's the standard /usr/lib,
-+    dnl   2. if it's already present in $LDFLAGS,
-+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-+    dnl   4. if it doesn't exist as a directory.
-+    if test "X$additional_libdir" != "X/usr/lib"; then
-+      haveit=
-+      for x in $LDFLAGS; do
-+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-+        if test "X$x" = "X-L$additional_libdir"; then
-+          haveit=yes
-+          break
-+        fi
-+      done
-+      if test -z "$haveit"; then
-+        if test "X$additional_libdir" = "X/usr/local/lib"; then
-+          if test -n "$GCC"; then
-+            case $host_os in
-+              linux*) haveit=yes;;
-+            esac
-+          fi
-+        fi
-+        if test -z "$haveit"; then
-+          if test -d "$additional_libdir"; then
-+            dnl Really add $additional_libdir to $LDFLAGS.
-+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-+          fi
-+        fi
-+      fi
-+    fi
-+  fi
-+])
-+
-+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-+dnl acl_final_exec_prefix, containing the values to which $prefix and
-+dnl $exec_prefix will expand at the end of the configure script.
-+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-+[
-+  dnl Unfortunately, prefix and exec_prefix get only finally determined
-+  dnl at the end of configure.
-+  if test "X$prefix" = "XNONE"; then
-+    acl_final_prefix="$ac_default_prefix"
-+  else
-+    acl_final_prefix="$prefix"
-+  fi
-+  if test "X$exec_prefix" = "XNONE"; then
-+    acl_final_exec_prefix='${prefix}'
-+  else
-+    acl_final_exec_prefix="$exec_prefix"
-+  fi
-+  acl_save_prefix="$prefix"
-+  prefix="$acl_final_prefix"
-+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-+  prefix="$acl_save_prefix"
-+])
-+
-+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-+dnl variables prefix and exec_prefix bound to the values they will have
-+dnl at the end of the configure script.
-+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-+[
-+  acl_save_prefix="$prefix"
-+  prefix="$acl_final_prefix"
-+  acl_save_exec_prefix="$exec_prefix"
-+  exec_prefix="$acl_final_exec_prefix"
-+  $1
-+  exec_prefix="$acl_save_exec_prefix"
-+  prefix="$acl_save_prefix"
-+])
---- /dev/null
-+++ atk-1.2.0/m4/progtest.m4
-@@ -0,0 +1,59 @@
-+# progtest.m4 serial 2 (gettext-0.10.40)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-+
-+# Search path for a program which passes the given test.
-+
-+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+  /*)
-+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if [$3]; then
-+	ac_cv_path_$1="$ac_dir/$ac_word"
-+	break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+dnl If no 4th arg is given, leave the cache variable unset,
-+dnl so AC_PATH_PROGS will keep looking.
-+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-+])dnl
-+  ;;
-+esac])dnl
-+$1="$ac_cv_path_$1"
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-+  AC_MSG_RESULT([$]$1)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+AC_SUBST($1)dnl
-+])
---- /dev/null
-+++ atk-1.2.0/m4/stdint_h.m4
-@@ -0,0 +1,28 @@
-+# stdint_h.m4 serial 2 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-+# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_STDINT_H],
-+[
-+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-+  [AC_TRY_COMPILE(
-+    [#include <sys/types.h>
-+#include <stdint.h>],
-+    [uintmax_t i = (uintmax_t) -1;],
-+    jm_ac_cv_header_stdint_h=yes,
-+    jm_ac_cv_header_stdint_h=no)])
-+  if test $jm_ac_cv_header_stdint_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-+   and declares uintmax_t. ])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/uintmax_t.m4
-@@ -0,0 +1,29 @@
-+# uintmax_t.m4 serial 6 (gettext-0.11)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_PREREQ(2.13)
-+
-+# Define uintmax_t to `unsigned long' or `unsigned long long'
-+# if <inttypes.h> does not exist.
-+
-+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-+[
-+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-+  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-+    test $ac_cv_type_unsigned_long_long = yes \
-+      && ac_type='unsigned long long' \
-+      || ac_type='unsigned long'
-+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-+  [Define to unsigned long or unsigned long long
-+   if <inttypes.h> and <stdint.h> don't define.])
-+  fi
-+])
---- /dev/null
-+++ atk-1.2.0/m4/ulonglong.m4
-@@ -0,0 +1,23 @@
-+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-+[
-+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-+  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-+    [unsigned long long ullmax = (unsigned long long) -1;
-+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-+    ac_cv_type_unsigned_long_long=yes,
-+    ac_cv_type_unsigned_long_long=no)])
-+  if test $ac_cv_type_unsigned_long_long = yes; then
-+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-+      [Define if you have the unsigned long long type.])
-+  fi
-+])
diff --git a/packages/atk/atk-1.6.0/gtk-doc.patch b/packages/atk/atk-1.6.0/gtk-doc.patch
deleted file mode 100644
index 04770290e1..0000000000
--- a/packages/atk/atk-1.6.0/gtk-doc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- /dev/null	2004-02-02 20:32:13.000000000 +0000
-+++ atk/acinclude.m4	2003-07-21 03:26:44.000000000 +0100
-@@ -0,0 +1,53 @@
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  dnl for overriding the documentation installation directory
-+  AC_ARG_WITH(html-dir,
-+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+    [with_html_dir='${datadir}/gtk-doc/html'])
-+  HTML_DIR="$with_html_dir"
-+  AC_SUBST(HTML_DIR)
-+
-+  dnl enable/disable documentation building
-+  AC_ARG_ENABLE(gtk-doc,
-+    AC_HELP_STRING([--enable-gtk-doc],
-+                   [use gtk-doc to build documentation [default=no]]),,
-+    enable_gtk_doc=no)
-+
-+  have_gtk_doc=no
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+    have_gtk_doc=yes
-+  fi
-+
-+  dnl do we want to do a version check?
-+ifelse([$1],[],,
-+  [gtk_doc_min_version=$1
-+  if test "$have_gtk_doc" = yes; then
-+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+      AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+      have_gtk_doc=no
-+    fi
-+  fi
-+])
-+  if test x$enable_gtk_doc = xyes; then
-+    if test "$have_gtk_doc" != yes; then
-+      enable_gtk_doc=no
-+    fi
-+  fi
-+
-+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])
diff --git a/packages/atk/atk_1.10.3.bb b/packages/atk/atk_1.10.3.bb
deleted file mode 100644
index ab359172a1..0000000000
--- a/packages/atk/atk_1.10.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2"
-
-do_stage () {
-        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-        autotools_stage_includes
-}
diff --git a/packages/atk/atk_1.2.0.bb b/packages/atk/atk_1.2.0.bb
deleted file mode 100644
index 767c13fb4d..0000000000
--- a/packages/atk/atk_1.2.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require atk.inc
-
-SRC_URI = "${GNOME_MIRROR}/atk/1.2/atk-${PV}.tar.bz2 \
-	   file://m4.patch;patch=1"
-
-do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/atk
-	install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h
-	install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h
-	install -m 0644 atk/atkdocument.h ${STAGING_INCDIR}/atk/atkdocument.h
-	install -m 0644 atk/atkeditabletext.h ${STAGING_INCDIR}/atk/atkeditabletext.h
-	install -m 0644 atk/atk-enum-types.h ${STAGING_INCDIR}/atk/atk-enum-types.h
-	install -m 0644 atk/atkgobjectaccessible.h ${STAGING_INCDIR}/atk/atkgobjectaccessible.h
-	install -m 0644 atk/atk.h ${STAGING_INCDIR}/atk/atk.h
-	install -m 0644 atk/atkhyperlink.h ${STAGING_INCDIR}/atk/atkhyperlink.h
-	install -m 0644 atk/atkhypertext.h ${STAGING_INCDIR}/atk/atkhypertext.h
-	install -m 0644 atk/atkimage.h ${STAGING_INCDIR}/atk/atkimage.h
-	install -m 0644 atk/atknoopobjectfactory.h ${STAGING_INCDIR}/atk/atknoopobjectfactory.h
-	install -m 0644 atk/atknoopobject.h ${STAGING_INCDIR}/atk/atknoopobject.h
-	install -m 0644 atk/atkobjectfactory.h ${STAGING_INCDIR}/atk/atkobjectfactory.h
-	install -m 0644 atk/atkobject.h ${STAGING_INCDIR}/atk/atkobject.h
-	install -m 0644 atk/atkregistry.h ${STAGING_INCDIR}/atk/atkregistry.h
-	install -m 0644 atk/atkrelation.h ${STAGING_INCDIR}/atk/atkrelation.h
-	install -m 0644 atk/atkrelationset.h ${STAGING_INCDIR}/atk/atkrelationset.h
-	install -m 0644 atk/atkrelationtype.h ${STAGING_INCDIR}/atk/atkrelationtype.h
-	install -m 0644 atk/atkselection.h ${STAGING_INCDIR}/atk/atkselection.h
-	install -m 0644 atk/atkstate.h ${STAGING_INCDIR}/atk/atkstate.h
-	install -m 0644 atk/atkstateset.h ${STAGING_INCDIR}/atk/atkstateset.h
-	install -m 0644 atk/atkstreamablecontent.h ${STAGING_INCDIR}/atk/atkstreamablecontent.h
-	install -m 0644 atk/atktable.h ${STAGING_INCDIR}/atk/atktable.h
-	install -m 0644 atk/atktext.h ${STAGING_INCDIR}/atk/atktext.h
-	install -m 0644 atk/atkutil.h ${STAGING_INCDIR}/atk/atkutil.h
-	install -m 0644 atk/atkvalue.h ${STAGING_INCDIR}/atk/atkvalue.h
-}
diff --git a/packages/atk/atk_1.6.0.bb b/packages/atk/atk_1.6.0.bb
deleted file mode 100644
index 320a205d9f..0000000000
--- a/packages/atk/atk_1.6.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \
-	   file://gtk-doc.patch;patch=1"
-
-do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/atk
-	install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h
-	install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h
-	install -m 0644 atk/atkdocument.h ${STAGING_INCDIR}/atk/atkdocument.h
-	install -m 0644 atk/atkeditabletext.h ${STAGING_INCDIR}/atk/atkeditabletext.h
-	install -m 0644 atk/atk-enum-types.h ${STAGING_INCDIR}/atk/atk-enum-types.h
-	install -m 0644 atk/atkgobjectaccessible.h ${STAGING_INCDIR}/atk/atkgobjectaccessible.h
-	install -m 0644 atk/atk.h ${STAGING_INCDIR}/atk/atk.h
-	install -m 0644 atk/atkhyperlink.h ${STAGING_INCDIR}/atk/atkhyperlink.h
-	install -m 0644 atk/atkhypertext.h ${STAGING_INCDIR}/atk/atkhypertext.h
-	install -m 0644 atk/atkimage.h ${STAGING_INCDIR}/atk/atkimage.h
-	install -m 0644 atk/atknoopobjectfactory.h ${STAGING_INCDIR}/atk/atknoopobjectfactory.h
-	install -m 0644 atk/atknoopobject.h ${STAGING_INCDIR}/atk/atknoopobject.h
-	install -m 0644 atk/atkobjectfactory.h ${STAGING_INCDIR}/atk/atkobjectfactory.h
-	install -m 0644 atk/atkobject.h ${STAGING_INCDIR}/atk/atkobject.h
-	install -m 0644 atk/atkregistry.h ${STAGING_INCDIR}/atk/atkregistry.h
-	install -m 0644 atk/atkrelation.h ${STAGING_INCDIR}/atk/atkrelation.h
-	install -m 0644 atk/atkrelationset.h ${STAGING_INCDIR}/atk/atkrelationset.h
-	install -m 0644 atk/atkrelationtype.h ${STAGING_INCDIR}/atk/atkrelationtype.h
-	install -m 0644 atk/atkselection.h ${STAGING_INCDIR}/atk/atkselection.h
-	install -m 0644 atk/atkstate.h ${STAGING_INCDIR}/atk/atkstate.h
-	install -m 0644 atk/atkstateset.h ${STAGING_INCDIR}/atk/atkstateset.h
-	install -m 0644 atk/atkstreamablecontent.h ${STAGING_INCDIR}/atk/atkstreamablecontent.h
-	install -m 0644 atk/atktable.h ${STAGING_INCDIR}/atk/atktable.h
-	install -m 0644 atk/atktext.h ${STAGING_INCDIR}/atk/atktext.h
-	install -m 0644 atk/atkutil.h ${STAGING_INCDIR}/atk/atkutil.h
-	install -m 0644 atk/atkvalue.h ${STAGING_INCDIR}/atk/atkvalue.h
-}
diff --git a/packages/atk/atk_1.6.1.bb b/packages/atk/atk_1.6.1.bb
deleted file mode 100644
index afc21753d5..0000000000
--- a/packages/atk/atk_1.6.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2"
-
-do_stage () {
-	oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
-}
diff --git a/packages/atk/atk_1.9.0.bb b/packages/atk/atk_1.9.0.bb
deleted file mode 100644
index 557858318d..0000000000
--- a/packages/atk/atk_1.9.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require atk.inc
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/atk-${PV}.tar.bz2"
-
-do_stage () {
-        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-        autotools_stage_includes
-}
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 3864dc5135..e8e9e7c4a8 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -45,10 +45,11 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
                         ${sysconfdir}/avahi/avahi-dnsconfd.action \
                         ${sysconfdir}/init.d/avahi-dnsconfd"
 FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
-		       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
+                       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
 FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
 FILES_avahi-discover = "${bindir}/avahi-discover \
                         ${datadir}/applications/avahi-discover.desktop \
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
new file mode 100644
index 0000000000..15f56ffa95
--- /dev/null
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -0,0 +1,5 @@
+require avahi.inc
+
+DEPENDS += "intltool-native"
+
+PACKAGES =+ "libavahi-gobject"
diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index 4a0cc7750d..e5acb6a1eb 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -6,10 +6,8 @@ proc		/proc		proc	defaults		0  0
 # usb?
 
 # Temporary
-tmpfs		/tmp		tmpfs   defaults        	0  0
 tmpfs		/var/volatile	tmpfs   mode=0755        	0  0
 tmpfs		/dev/shm		tmpfs	mode=0777			0  0
-tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
 /dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab
index 4a0cc7750d..e5acb6a1eb 100644
--- a/packages/base-files/base-files/fic-gta02/fstab
+++ b/packages/base-files/base-files/fic-gta02/fstab
@@ -6,10 +6,8 @@ proc		/proc		proc	defaults		0  0
 # usb?
 
 # Temporary
-tmpfs		/tmp		tmpfs   defaults        	0  0
 tmpfs		/var/volatile	tmpfs   mode=0755        	0  0
 tmpfs		/dev/shm		tmpfs	mode=0777			0  0
-tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
 /dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
diff --git a/packages/binutils/binutils-cross-sdk_2.18.bb b/packages/binutils/binutils-cross-sdk_2.18.bb
index a045d9bc9c..81c84229b0 100644
--- a/packages/binutils/binutils-cross-sdk_2.18.bb
+++ b/packages/binutils/binutils-cross-sdk_2.18.bb
@@ -5,7 +5,9 @@ DEPENDS += "flex-native bison-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
 		--program-prefix=${TARGET_PREFIX}"
-PR = "r2"
+PR = "r3"
+
+FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug"
 
 do_stage() {
 	:
diff --git a/packages/bluez/bluez-cups-backend_3.23.bb b/packages/bluez/bluez-cups-backend_3.23.bb
new file mode 100644
index 0000000000..64884fa904
--- /dev/null
+++ b/packages/bluez/bluez-cups-backend_3.23.bb
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "cups"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --disable-alsa \ 
+		 --enable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_${PN} = "cups"
\ No newline at end of file
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.23.bb b/packages/bluez/bluez-gstreamer-plugin_3.23.bb
new file mode 100644
index 0000000000..c5a1a9acee
--- /dev/null
+++ b/packages/bluez/bluez-gstreamer-plugin_3.23.bb
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --enable-gstreamer \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-libs_3.23.bb b/packages/bluez/bluez-libs_3.23.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.23.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils-alsa_3.23.bb b/packages/bluez/bluez-utils-alsa_3.23.bb
new file mode 100644
index 0000000000..e2f48fba49
--- /dev/null
+++ b/packages/bluez/bluez-utils-alsa_3.23.bb
@@ -0,0 +1,24 @@
+require bluez-utils3.inc
+
+DEPENDS += "alsa-lib"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --disable-hid2hci \
+                 --enable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb
new file mode 100644
index 0000000000..48f147aa69
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.23.bb
@@ -0,0 +1,29 @@
+require bluez-utils3.inc
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --disable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+                         "
+
diff --git a/packages/busybox/slingbox-1.3.1/trylink-bash.patch b/packages/busybox/slingbox-1.3.1/trylink-bash.patch
new file mode 100644
index 0000000000..a1b00f6ddb
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/trylink-bash.patch
@@ -0,0 +1,8 @@
+--- busybox-1.3.1/scripts/trylink~	2006-12-27 15:23:24.000000000 +1030
++++ busybox-1.3.1/scripts/trylink	2007-12-19 15:03:20.000000000 +1030
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ debug=false
+ 
diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb
index 62d150a9fe..4d3ab56cc3 100644
--- a/packages/busybox/slingbox_1.3.1.bb
+++ b/packages/busybox/slingbox_1.3.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -14,6 +14,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://lazy_umount.patch;patch=1 \
            file://halt.patch;patch=1 \
            file://fdisk-readhex.patch;patch=1 \
+           file://trylink-bash.patch;patch=1 \
            file://slingbox_name.patch;patch=1 \
            file://slingbox.patch;patch=1"
 
diff --git a/packages/curl/curl_7.16.4.bb b/packages/curl/curl_7.16.4.bb
index f59d32d17a..0053a12fdb 100644
--- a/packages/curl/curl_7.16.4.bb
+++ b/packages/curl/curl_7.16.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 S = "${WORKDIR}/curl-${PV}"
@@ -12,8 +12,9 @@ inherit autotools pkgconfig binconfig
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
                 --without-ssl \
+                --without-libssh2 \
 		--with-random=/dev/urandom \
-		--without-idn \
+		--without-libidn \
 		--enable-crypto-auth \
 		"
 
diff --git a/packages/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb
index 64de9fcbf3..56095f5c99 100644
--- a/packages/devmem2/devmem2.bb
+++ b/packages/devmem2/devmem2.bb
@@ -1,3 +1,4 @@
+DESCRIPTION = "Simple program to read/write from/to any location in memory."
 SRC_URI = "http://www.abcsinc.com/small-linux/devmem2.c"
 LICENSE = "GPL"
 
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 8a792b4ae4..064a808273 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -3,8 +3,10 @@ DEPENDS = "directfb"
 SECTION = "libs"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-extra-${PV}.tar.gz"
-S = "${WORKDIR}/DirectFB-extra-${PV}"
+SRC_URI = " \
+           http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \
+          "
+S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc
new file mode 100644
index 0000000000..0843f36198
--- /dev/null
+++ b/packages/directfb/directfb.inc
@@ -0,0 +1,76 @@
+DESCRIPTION = "DirectFB is a thin library that provides developers \
+with hardware graphics acceleration, input device handling and \
+abstraction, an integrated windowing system with support for \
+translucent windows and multiple display layers on top of the \
+Linux framebuffer device."
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://directfb.org"
+DEPENDS = "jpeg libpng freetype zlib tslib"
+RV = "1.0-0"
+PR = "r4"
+
+SRC_URI = " \
+    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    file://fix-pkgconfig-cflags.patch;patch=1 \
+    file://fix-font-missing-char.patch;patch=1 \
+    file://getpagesize.patch;patch=1 \
+    file://fix-includes.patch;patch=1 \
+    file://mkdfiff.patch;patch=1 \
+"
+S = "${WORKDIR}/DirectFB-${PV}"
+
+LDFLAGS_append =" -lts -lm"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+  --with-gfxdrivers=none \
+  --enable-libmpeg3=no \
+  --enable-freetype=yes \
+  --enable-sdl=no \
+  --enable-vnc=no \
+  --disable-x11 \
+"
+
+do_stage() {
+        autotools_stage_all
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}
+
+
+#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
+#
+#python populate_packages_prepend () {
+#    import os.path
+#    inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
+#    do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
+#}
+
+# NOTE: monolithic packaging for now, should improve that eventually
+
+
+
+FILES_${PN}-dbg += "\
+  ${libdir}/directfb-${RV}/*/*/.debug/*.so \
+  ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
+
+FILES_${PN}-dev += "\
+  ${bindir}/directfb-config \
+  ${libdir}/directfb-${RV}/systems/*.la \
+  ${libdir}/directfb-${RV}/inputdrivers/*.la \
+  ${libdir}/directfb-${RV}/interfaces/*/*.la \
+  ${libdir}/directfb-${RV}/wm/*.la \
+"
+
+FILES_${PN} += "\
+  ${libdir}/directfb-${RV}/systems/*.so \
+  ${libdir}/directfb-${RV}/inputdrivers/*.so \
+  ${libdir}/directfb-${RV}/interfaces/*/*.so \
+  ${libdir}/directfb-${RV}/wm/*.so \
+  ${datadir}/directfb-${PV} \
+"
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index c2d249e978..5b4690fe93 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -1,56 +1,4 @@
-DESCRIPTION = "DirectFB is a thin library that provides developers \
-with hardware graphics acceleration, input device handling and \
-abstraction, an integrated windowing system with support for \
-translucent windows and multiple display layers on top of the \
-Linux framebuffer device."
-SECTION = "libs"
-LICENSE = "LGPL"
-HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r5"
-RV = "1.0-0"
-
-SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-specs.patch;patch=1 \
-           file://mkdfiff.patch;patch=1 \
-           file://getpagesize.patch;patch=1 \
-           file://fix-includes.patch;patch=1"
-S = "${WORKDIR}/DirectFB-1.0.0"
-
-LDFLAGS_append =" -lts -lm"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
-		--with-gfxdrivers=none \
-		--enable-libmpeg3=no \
-		--enable-freetype=yes \
-		--enable-sdl=no \
-        --enable-vnc=no \
-		"
-
-do_stage() {
-        autotools_stage_all
-}
+require directfb.inc
 
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
-
-
-FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-                            ${libdir}/directfb-${RV}/*/.debug/*.so \
-"
-
-FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
-                              ${libdir}/directfb-${RV}/inputdrivers/*.la \
-                              ${libdir}/directfb-${RV}/interfaces/*/*.la \
-                              ${libdir}/directfb-${RV}/wm/*.la \
-"
-
-FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
-                          ${libdir}/directfb-${RV}/inputdrivers/*.so \
-                          ${libdir}/directfb-${RV}/interfaces/*/*.so \
-                          ${libdir}/directfb-${RV}/wm/*.so \
-                          ${datadir}/directfb-1.0.0 \
-"
+RV = "1.0-0"
+PR = "r4"
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index 84772b6a25..39002fdb5d 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -1,65 +1,4 @@
-DESCRIPTION = "DirectFB is a thin library that provides developers \
-with hardware graphics acceleration, input device handling and \
-abstraction, an integrated windowing system with support for \
-translucent windows and multiple display layers on top of the \
-Linux framebuffer device."
-SECTION = "libs"
-LICENSE = "LGPL"
-HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r1"
-RV = "1.1-0"
-
-SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
-           file://fix-pkgconfig-cflags.patch;patch=1 \
-	   file://fix-font-missing-char.patch;patch=1 \
-           file://getpagesize.patch;patch=1 \
-           file://fix-includes.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1"
-
-S = "${WORKDIR}/DirectFB-${PV}"
-
-LDFLAGS_append =" -lts -lm"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-gfxdrivers=none \
-		--enable-libmpeg3=no \
-		--enable-freetype=yes \
-		--enable-sdl=no \
-	        --enable-vnc=no \
-		--disable-x11 \
-		"
-
-do_stage() {
-        autotools_stage_all
-}
+require directfb.inc
 
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
-
-PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
-
-#python populate_packages_prepend () {
-#	import os.path
-#	inputdrivers_libdir    = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
-#        do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
-#}
-FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-			      ${libdir}/directfb-${RV}/*/.debug/*.so \
-			  "
-
-FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
-                              ${libdir}/directfb-${RV}/inputdrivers/*.la \
-                              ${libdir}/directfb-${RV}/interfaces/*/*.la \
-                              ${libdir}/directfb-${RV}/wm/*.la \
-			"
-
-
-FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
-        #                  ${libdir}/directfb-${RV}/inputdrivers/*.so \
-        #                  ${libdir}/directfb-${RV}/interfaces/*/*.so \
-                          ${libdir}/directfb-${RV}/wm/*.so \
-                          ${datadir}/directfb-1.1.0 \
-			  "
+RV = "1.1-0"
+PR = "r3"
diff --git a/packages/directfb/files/fix-pkgconfig-cflags.patch b/packages/directfb/files/fix-pkgconfig-cflags.patch
index 0273b58ec5..ddaa276fcd 100644
--- a/packages/directfb/files/fix-pkgconfig-cflags.patch
+++ b/packages/directfb/files/fix-pkgconfig-cflags.patch
@@ -6,7 +6,7 @@ diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-inte
  Version: @VERSION@
  Requires: directfb = @VERSION@
 -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
-+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
 --- DirectFB-1.0.0~org/directfb.pc.in	2004-08-04 12:28:20.000000000 -0400
 +++ DirectFB-1.0.0/directfb.pc.in	2007-03-16 22:31:33.000000000 -0400
@@ -15,7 +15,7 @@ diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
  Requires: fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
-+Cflags: @THREADFLAGS@ -I${includedir}
++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in
 --- DirectFB-1.0.0~org/lib/direct/direct.pc.in	2005-11-23 09:18:59.000000000 -0500
 +++ DirectFB-1.0.0/lib/direct/direct.pc.in	2007-03-16 22:32:13.000000000 -0400
@@ -24,7 +24,7 @@ diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/di
  Version: @VERSION@
  Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
-+Cflags: @THREADFLAGS@ -I${includedir}
++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in
 --- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in	2004-05-19 07:30:56.000000000 -0400
 +++ DirectFB-1.0.0/lib/fusion/fusion.pc.in	2007-03-16 22:32:34.000000000 -0400
@@ -33,7 +33,7 @@ diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fu
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I@INCLUDEDIR@
-+Cflags: -I${includedir}
++Cflags: -I${includedir}/directfb -I${includedir}
 diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
 --- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in	2004-05-19 07:31:28.000000000 -0400
 +++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in	2007-03-16 22:32:55.000000000 -0400
@@ -42,4 +42,4 @@ diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/vo
  Requires: direct
  Libs: -L${libdir} -lvoodoo
 -Cflags: -I@INCLUDEDIR@
-+Cflags: -I${includedir}
++Cflags: -I${includedir}/directfb -I${includedir}
diff --git a/packages/atk/atk-1.6.0/.mtn2git_empty b/packages/dropbear/dropbear-early/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/atk/atk-1.6.0/.mtn2git_empty
+++ b/packages/dropbear/dropbear-early/.mtn2git_empty
diff --git a/packages/dropbear/dropbear-early/dropbear-early b/packages/dropbear/dropbear-early/dropbear-early
new file mode 100644
index 0000000000..fa06a93003
--- /dev/null
+++ b/packages/dropbear/dropbear-early/dropbear-early
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for x in $(cat /proc/cmdline); do
+        case $x in
+        dropbear=early)
+                echo "Starting dropbear early"
+                exec /etc/init.d/dropbear $*
+                ;;
+        esac
+done
diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb
new file mode 100644
index 0000000000..df2c2dc26f
--- /dev/null
+++ b/packages/dropbear/dropbear-early_1.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
+SECTION = "devel"
+PR = "r2"
+RDEPENDS = "dropbear"
+
+SRC_URI = "file://dropbear-early"
+
+inherit update-rc.d
+
+do_install() {
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
+PACKAGE_ARCH = "all"
+
+INITSCRIPT_NAME = "dropbear-early"
+INITSCRIPT_PARAMS = "start 00 S ."
diff --git a/packages/dtc/dtc-native_1.0.0.bb b/packages/dtc/dtc-native_1.0.0.bb
new file mode 100644
index 0000000000..35c9b1161c
--- /dev/null
+++ b/packages/dtc/dtc-native_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels."
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEFAULT_PREFERENCE = "1"
+
+SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz"
+
+S = "${WORKDIR}/dtc"
+
+inherit autotools native
+
+do_stage() {
+	install -m 755 dtc ${STAGING_BINDIR}/dtc
+}
diff --git a/packages/linux/linux-handhelds-2.6/.mtn2git_empty b/packages/e17/expedite/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/.mtn2git_empty
+++ b/packages/e17/expedite/.mtn2git_empty
diff --git a/packages/e17/expedite/hack-disable-opengl.patch b/packages/e17/expedite/hack-disable-opengl.patch
new file mode 100644
index 0000000000..7d368d320d
--- /dev/null
+++ b/packages/e17/expedite/hack-disable-opengl.patch
@@ -0,0 +1,87 @@
+Index: expedite/configure.in
+===================================================================
+--- expedite.orig/configure.in
++++ expedite/configure.in
+@@ -47,24 +47,11 @@
+ PKG_CHECK_MODULES([EVAS], evas)
+ 
+ dnl OpenGL GLEW
+-PKG_CHECK_EXISTS(evas-opengl-glew,
+-  [
+-    AC_DEFINE(HAVE_EVAS_OPENGL_GLEW, 1, [Evas GL Glew Engine Support])
+-    have_opengl_glew="yes"
+-    glew_libs="-lglew32 -lgdi32"
+-  ],
+-  [ have_opengl_glew="no" ]
+-)
++have_opengl_glew="no"
+ AM_CONDITIONAL(BUILD_OPENGL_GLEW, test "x$have_opengl_glew" = "xyes")
+ 
+ dnl OpenGL X11
+-PKG_CHECK_EXISTS(evas-opengl-x11,
+-  [
+-    AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas GL X11 Engine Support])
+-    have_opengl_x11="yes"
+-  ],
+-  [ have_opengl_x11="no" ]
+-)
++have_opengl_x11="no"
+ AM_CONDITIONAL(BUILD_OPENGL_X11, test "x$have_opengl_x11" = "xyes")
+ 
+ dnl Software X11
+@@ -109,49 +96,23 @@
+ 
+ # TODO: Check availability of libs
+ dnl DirectDraw
+-PKG_CHECK_EXISTS(evas-software-ddraw,
+-  [
+-    AC_DEFINE(HAVE_EVAS_SOFTWARE_DDRAW, 1, [Evas Software DirectDraw Engine Support])
+-    have_software_ddraw="yes"
+-    ddraw_libs="-lddraw -ldxguid"
+-  ],
+-  [ have_software_ddraw="no" ]
+-)
++have_software_ddraw="no"
+ AM_CONDITIONAL(BUILD_SOFTWARE_DDRAW, test "x$have_software_ddraw" = "xyes")
+ 
+ # TODO: Check availability of libs
+ dnl 16bit DirectDraw
+-PKG_CHECK_EXISTS(evas-software-16-ddraw,
+-  [
+-    AC_DEFINE(HAVE_EVAS_SOFTWARE_16_DDRAW, 1, [Evas Software 16bit DirectDraw Engine Support])
+-    have_software_16_ddraw="yes"
+-    ddraw_libs="-lddraw -ldxguid"
+-  ],
+-  [ have_software_16_ddraw="no" ]
+-)
++have_software_16_ddraw="no"
+ AM_CONDITIONAL(BUILD_SOFTWARE_16_DDRAW, test "x$have_software_16_ddraw" = "xyes")
+ 
+ # TODO: Check availability of libs
+ dnl Direct3D
+-PKG_CHECK_EXISTS(evas-direct3d,
+-  [
+-    AC_DEFINE(HAVE_EVAS_DIRECT3D, 1, [Evas Direct3D Engine Support])
+-    have_direct3d="yes"
+-    d3d_libs="-ld3d9 -ld3dx9d"
+-  ],
+-  [ have_direct3d="no" ]
+-)
++have_direct3d="no"
+ AM_CONDITIONAL(BUILD_DIRECT3D, test "x$have_direct3d" = "xyes")
+ 
+ dnl Software SDL
+-PKG_CHECK_EXISTS(evas-software-sdl,
+-  [
+-    AC_DEFINE(HAVE_EVAS_SOFTWARE_SDL, 1, [Evas Software SDL Engine Support])
+-    have_software_sdl="yes"
+-  ],
+-  [ have_direct3d="no" ]
+-)
+-AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes")
++have_software_sdl="no"
++AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes")
++
+ 
+ if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then
+   AC_PATH_XTRA
diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index 9d8a7d6070..7eae0ea9a4 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -1,15 +1,19 @@
-DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas"
-DEPENDS = "evas"
+DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
+DEPENDS = "eet evas"
+RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
 LICENSE = "MIT"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.6.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit e
+inherit autotools
 
-SRC_URI = "${E_CVS};module=e17/apps/expedite"
+SRC_URI = "${E_CVS};module=e17/apps/expedite \
+           file://hack-disable-opengl.patch;patch=1"
 S = "${WORKDIR}/${PN}"
 
 do_configure_append() {
         find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
 
+FILES_${PN} += "${datadir}"
+
diff --git a/packages/e17/rage_0.2.0.003.bb b/packages/e17/rage_0.2.0.003.bb
deleted file mode 100644
index ab527e214b..0000000000
--- a/packages/e17/rage_0.2.0.003.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "rage is a media center application based on EFL"
-AUTHOR = "Carsten 'The Rasterman' Heitzler"
-HOMEPAGE = "http://www.rasterman.com"
-LICENSE = "GPL"
-DEPENDS = "evas ecore edje"
-SECTION = "x11/multimedia"
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/rage-${PV}.tar.gz"
-
-inherit e
diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_0.2.0.005.bb
new file mode 100644
index 0000000000..e5b5032b10
--- /dev/null
+++ b/packages/e17/rage_0.2.0.005.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Rage is a media center application based on EFL"
+AUTHOR = "Carsten 'The Rasterman' Heitzler"
+HOMEPAGE = "http://www.rasterman.com"
+LICENSE = "GPL"
+DEPENDS = "evas ecore edje"
+SECTION = "x11/multimedia"
+
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz"
+
+inherit autotools
+
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
index dcb5c412d0..e111ac9b61 100644
--- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -2,6 +2,8 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
+PR = "r1"
+
 EXTRA_OECONF = ""
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
index f209baf3b4..7673d49e21 100644
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ b/packages/e2fsprogs/e2fsprogs.inc
@@ -9,6 +9,7 @@ S = "${WORKDIR}/e2fsprogs-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = " --enable-dynamic-e2fsck"
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF += " --enable-dynamic-e2fsck"
 
 PARALLEL_MAKE = ""
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 2e8bf3d219..4f6f62bb12 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r8"
+PR = "r10"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
 
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 86c87214cf..b71a4b7582 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -9,9 +9,11 @@ PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-SRC_URI += "file://configure.patch;patch=1 \
-           file://fix-tslib-configure.patch;patch=1 \
-           file://fix-directfb-include.patch;patch=1"
+# SRC_URI += "file://configure.patch;patch=1 \
+#           file://fix-tslib-configure.patch;patch=1 \
+#           file://fix-directfb-include.patch;patch=1"
+
+SRC_URI += "file://fix-directfb-include.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index dd6c467c54..53ee8642d8 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -6,8 +6,8 @@ EXTRA_OECONF = "\
 		--disable-ecore-x-xcb \
 		--enable-ecore-x \
 		--enable-ecore-job \
-		--enable-ecore-directfb \
-		--enable-ecore-sdl \
+		--disable-ecore-directfb \
+		--disable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
 		--disable-ecore-evas-gl \
diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb
index 8b8694899e..204abbb821 100644
--- a/packages/efl1/evas-native_cvs.bb
+++ b/packages/efl1/evas-native_cvs.bb
@@ -6,7 +6,7 @@ PR = "r0"
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
-		--disable-fb				\
+		--enable-fb				\
 		--disable-directfb			\
 		--disable-sdl				\
 		--enable-buffer				\
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 840f2929c5..179f03b0d8 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -3,13 +3,13 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
-# can also depend on valgrind (?)
-DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext"
+# can also depend on valgrind, libsdl-x11, directfb
+DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender"
 PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-SRC_URI += "file://fix-configure.patch;patch=1"
+# SRC_URI += "file://fix-configure.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
@@ -33,3 +33,5 @@ do_install_append() {
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 FILES_${PN} = "${libdir}/libevas*.so*"
+
+PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index b80ff8bcba..1bacbe3d1c 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,17 +1,17 @@
 require evas.inc
-PR = "r0"
+PR = "r3"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
 		--enable-fb					\
-		--enable-directfb			\
-		--enable-sdl				\
+		--disable-directfb			\
+		--disable-sdl				\
 		--enable-buffer				\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\
 		--enable-software-x11		\
-		--disable-software-16-x11	\
+		--enable-software-16-x11	\
 		--disable-software-xcb		\
 		--disable-gl-x11			\
 		--enable-xrender-x11		\
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 2ac7c65279..8fb8521d62 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -1,14 +1,26 @@
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library \
 based on the enlightenment foundation libraries."
-DEPENDS = "evas ecore edje emotion efreet"
+DEPENDS = "evas ecore edje emotion efreet epsilon"
 RSUGGESTS_${PN} += "ewl-themes"
 LICENSE = "MIT"
 PV = "0.5.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library
 
+EXTRA_OECONF = "\
+  --enable-software-x11 \
+  --enable-software-16-x11 \
+  --enable-xrender-x11 \
+  --disable-opengl-x11 \
+  --disable-software-xcb \
+  --disable-software-sdl \
+  --enable-framebuffer \
+  --enable-software-buffer \
+  --disable-opengl-glew \
+"
+
 # TODO package engines more granular
 PACKAGES += "${PN}-plugins ${PN}-engines"
 
diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb
index 8b598bf21f..3878c42536 100644
--- a/packages/emacs/emacs-x11_20060801.bb
+++ b/packages/emacs/emacs-x11_20060801.bb
@@ -1,3 +1,5 @@
 require emacs-x11_cvs.bb
-SRCDATE = "${PV}"
+
+SRCDATE = "20060801"
+
 DEFAULT_PREFERENCE = "0"
diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb
index 8fdba95742..809176a3c3 100644
--- a/packages/emacs/emacs-x11_cvs.bb
+++ b/packages/emacs/emacs-x11_cvs.bb
@@ -1,5 +1,8 @@
 require emacs_cvs.bb
+
 # full X (non-diet) is needed for X support
 DEPENDS += "libx11"
+
 EXTRA_OECONF = "--without-sound"
+
 RREPLACES = "emacs"
diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb
index aa72944eca..834e5b6239 100644
--- a/packages/emacs/emacs_20060801.bb
+++ b/packages/emacs/emacs_20060801.bb
@@ -1,3 +1,3 @@
 require emacs_cvs.bb
-SRCDATE = "${PV}"
+SRCDATE = "20060801"
 DEFAULT_PREFERENCE = "0"
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index ef58dfa5b6..e8f263d1a9 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -7,7 +7,9 @@ DEPENDS += "qemu-native"
 #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2
 # the build gets hung up on compiling certain .el files
 
-PR = "r7"
+PV = "22.0.50+cvs${SRCDATE}" 
+PE = "1"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -17,14 +19,14 @@ S = "${WORKDIR}/emacs"
 
 inherit autotools
 
-PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "${PN}-el"
 
-FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \
-                  ${datadir}/emacs/22.0.50/*/*/*.el.gz"
+FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
+                  ${datadir}/emacs/*/*/*/*.el.gz"
 
 FILES_${PN} += "${datadir}/emacs"
 
-QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
 LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index 7f84ebe4fe..ddd7acef82 100644
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Enca is an Extremely Naive Charset Analyser"
-LICENSE = "GPL2"
 SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \
+SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \
 	file://configure-hack.patch;patch=1 \
 	file://dont-run-tests.patch;patch=1 \
 	file://configure-remove-dumbness.patch;patch=1 \
diff --git a/packages/enchant/enchant_1.3.0.bb b/packages/enchant/enchant_1.3.0.bb
index 4e257618fb..cceceebabf 100644
--- a/packages/enchant/enchant_1.3.0.bb
+++ b/packages/enchant/enchant_1.3.0.bb
@@ -15,6 +15,8 @@ SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz
 
 EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${layout_prefix} --enable-aspell --disable-binreloc"
 
+export CXXFLAGS += " -L${STAGING_LIBDIR} -lstdc++ "
+
 FILES_${PN} = "/usr/bin/* /usr/lib/enchant/*.so /usr/share/enchant /usr/lib/libenchant*.so.*"
 
 do_stage() {
diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb
index 9fe9c3190c..a326180997 100644
--- a/packages/fbreader/fbreader_0.7.3d.bb
+++ b/packages/fbreader/fbreader_0.7.3d.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
diff --git a/packages/fbreader/fbreader_0.7.4q.bb b/packages/fbreader/fbreader_0.7.4q.bb
index bcea83a4a1..de2bf358a4 100644
--- a/packages/fbreader/fbreader_0.7.4q.bb
+++ b/packages/fbreader/fbreader_0.7.4q.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index ca25bdc620..fa982040f9 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
diff --git a/packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff b/packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff
new file mode 100644
index 0000000000..3d2753a01f
--- /dev/null
+++ b/packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff
@@ -0,0 +1,512 @@
+Index: configure
+===================================================================
+--- flite-1.2-release/configure	(.../flite-1.2-orig)	(revision 10)
++++ flite-1.2-release/configure	(.../release-v1.2)	(revision 10)
+@@ -1415,16 +1415,16 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
+-echo "configure:1421: checking for sys/asoundlib.h" >&5
++ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
++echo "configure:1421: checking for alsa/asoundlib.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1426 "configure"
+ #include "confdefs.h"
+-#include <sys/asoundlib.h>
++#include <alsa/asoundlib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -1445,23 +1445,24 @@
+   echo "$ac_t""yes" 1>&6
+   AUDIODRIVER="alsa"
+ 	       AUDIODEFS=-DCST_AUDIO_ALSA
++		   AUDIOLIBS=-lasound
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6
+-echo "configure:1455: checking for mmsystem.h" >&5
++echo "configure:1456: checking for mmsystem.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1460 "configure"
++#line 1461 "configure"
+ #include "confdefs.h"
+ #include <mmsystem.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+Index: include/cst_sts.h
+===================================================================
+--- flite-1.2-release/include/cst_sts.h	(.../flite-1.2-orig)	(revision 10)
++++ flite-1.2-release/include/cst_sts.h	(.../release-v1.2)	(revision 10)
+@@ -47,9 +47,9 @@
+ /* else where, this information plus the indexes in the Unit relation */
+ /* allow reconstruction of the signal itself                          */
+ struct cst_sts_struct {
+-    const unsigned short *frame;  
+-    const int size;      /* in samples */
+-    const unsigned char *residual;
++    unsigned short *frame;  
++    int size;      /* in samples */
++    unsigned char *residual;
+ };
+ typedef struct cst_sts_struct cst_sts;
+ 
+Index: configure.in
+===================================================================
+--- flite-1.2-release/configure.in	(.../flite-1.2-orig)	(revision 10)
++++ flite-1.2-release/configure.in	(.../release-v1.2)	(revision 10)
+@@ -131,9 +131,10 @@
+ AC_CHECK_HEADER(sys/audioio.h,
+               [AUDIODRIVER="sun"
+                AUDIODEFS=-DCST_AUDIO_SUNOS])
+-AC_CHECK_HEADER(sys/asoundlib.h,
++AC_CHECK_HEADER(alsa/asoundlib.h,
+               [AUDIODRIVER="alsa"
+-	       AUDIODEFS=-DCST_AUDIO_ALSA])
++	       AUDIODEFS=-DCST_AUDIO_ALSA
++		   AUDIOLIBS=-lasound])
+ AC_CHECK_HEADER(mmsystem.h,
+ 	      [AUDIODRIVER="wince"
+ 	       AUDIODEFS=-DCST_AUDIO_WINCE
+Index: src/audio/au_alsa.c
+===================================================================
+--- flite-1.2-release/src/audio/au_alsa.c	(.../flite-1.2-orig)	(revision 10)
++++ flite-1.2-release/src/audio/au_alsa.c	(.../release-v1.2)	(revision 10)
+@@ -2,7 +2,7 @@
+ /*                                                                       */
+ /*                  Language Technologies Institute                      */
+ /*                     Carnegie Mellon University                        */
+-/*                        Copyright (c) 2001                             */
++/*                        Copyright (c) 2000                             */
+ /*                        All Rights Reserved.                           */
+ /*                                                                       */
+ /*  Permission is hereby granted, free of charge, to use and distribute  */
+@@ -29,158 +29,283 @@
+ /*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
+ /*  THIS SOFTWARE.                                                       */
+ /*                                                                       */
++/*********************************************************************** */
++/*             Author:  Lukas Loehrer (                                  */
++/*               Date:  January 2005                                     */
+ /*************************************************************************/
+-/*             Author:  Geoff Harrison (mandrake@cepstral.com)           */
+-/*               Date:  Sepetember 2001                                  */
+-/*************************************************************************/
+ /*                                                                       */
+-/*  Access to ALSA audio devices                                          */
+-/*                                                                       */
++/*  Native access to alsa audio devices on Linux                         */
++/*  Tested with libasound version 1.0.10                                 */
+ /*************************************************************************/
+ 
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <assert.h>
++#include <errno.h>
++
+ #include "cst_string.h"
+ #include "cst_wave.h"
+ #include "cst_audio.h"
+ 
+-#include <sys/asoundlib.h>
++#include <alsa/asoundlib.h>
+ 
+-#include <sys/stat.h>
+-#include <fcntl.h>
+ 
+-static int alsa_card = 0, alsa_device = 0;
++/*static char *pcm_dev_name = "hw:0,0"; */
++static char *pcm_dev_name ="default";
+ 
++static inline void print_pcm_state(snd_pcm_t *handle, char *msg)
++{
++  fprintf(stderr, "PCM state at %s = %s\n", msg,
++		  snd_pcm_state_name(snd_pcm_state(handle)));
++}
++
+ cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt)
+ {
+-    snd_pcm_channel_info_t pinfo;
+-    snd_pcm_channel_params_t params;
+-    snd_pcm_channel_setup_t setup;
+-    snd_pcm_t *pcm;
+-    cst_audiodev *ad;
+-    int err;
++  cst_audiodev *ad;
++  unsigned 	int real_rate;
++  int err;
+ 
+-#ifdef __QNXNTO__
+-    if (snd_pcm_open_preferred(&pcm,&alsa_card,&alsa_device,SND_PCM_OPEN_PLAYBACK) < 0)
+-    {
+-	cst_errmsg("alsa_audio: failed to open audio device\n");
+-	cst_error();
+-    }
+-    if (snd_pcm_plugin_set_disable(pcm,PLUGIN_DISABLE_MMAP) < 0)
+-    {
+-	cst_errmsg("alsa_audio: failed to disable mmap\n");
+-	snd_pcm_close(pcm);
+-	cst_error();
+-    }
+-#else
+-    if (snd_pcm_open(&pcm,alsa_card,alsa_device,SND_PCM_OPEN_PLAYBACK) < 0)
+-    {
+-	cst_errmsg("alsa_audio: failed to open audio device\n");
+-	cst_error();
+-    }
+-#endif
++  /* alsa specific stuff */
++  snd_pcm_t *pcm_handle;          
++  snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
++  snd_pcm_hw_params_t *hwparams;
++  snd_pcm_format_t format;
++  snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED;
+ 
++  /* Allocate the snd_pcm_hw_params_t structure on the stack. */
++  snd_pcm_hw_params_alloca(&hwparams);
+ 
+-    memset(&pinfo, 0, sizeof(pinfo));
+-    memset(&params, 0, sizeof(params));
+-    memset(&setup, 0, sizeof(setup));
++  /* Open pcm device */
++  err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0);
++  if (err < 0) 
++  {
++	cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n",
++			   pcm_dev_name, snd_strerror(err));
++	return NULL;
++  }
+ 
+-    pinfo.channel = SND_PCM_CHANNEL_PLAYBACK;
+-    snd_pcm_plugin_info(pcm,&pinfo);
++  /* Init hwparams with full configuration space */
++  err = snd_pcm_hw_params_any(pcm_handle, hwparams);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err));
++	return NULL;
++  }
+ 
+-    params.mode = SND_PCM_MODE_BLOCK;
+-    params.channel = SND_PCM_CHANNEL_PLAYBACK;
+-    params.start_mode = SND_PCM_START_DATA;
+-    params.stop_mode = SND_PCM_STOP_STOP;
++  /* Set access mode */
++  err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err));
++	return NULL;
++  }
+ 
+-    params.buf.block.frag_size = pinfo.max_fragment_size;
+-    params.buf.block.frags_max = 1;
+-    params.buf.block.frags_min = 1;
+-    
+-    params.format.interleave = 1;
+-    params.format.rate = sps;
+-    params.format.voices = channels;
+-
+-    switch (fmt)
+-    {
+-    case CST_AUDIO_LINEAR16:
++  /* Determine matching alsa sample format */
++  /* This could be implemented in a more */
++  /* flexible way (byte order conversion). */
++  switch (fmt)
++  {
++  case CST_AUDIO_LINEAR16:
+ 	if (CST_LITTLE_ENDIAN)
+-	    params.format.format = SND_PCM_SFMT_S16_LE;
++	  format = SND_PCM_FORMAT_S16_LE;
+ 	else
+-	    params.format.format = SND_PCM_SFMT_S16_BE;
++	  format = SND_PCM_FORMAT_S16_BE;
+ 	break;
+-    case CST_AUDIO_LINEAR8:
+-	params.format.format = SND_PCM_SFMT_U8;
++  case CST_AUDIO_LINEAR8:
++	format = SND_PCM_FORMAT_U8;
+ 	break;
+-    case CST_AUDIO_MULAW:
+-	params.format.format = SND_PCM_SFMT_MU_LAW;
++  case CST_AUDIO_MULAW:
++	format = SND_PCM_FORMAT_MU_LAW;
+ 	break;
+-    }
++  default:
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to find suitable format.\n");
++	return NULL;
++	break;
++  }
+ 
+-    if((err = snd_pcm_plugin_params(pcm,&params)) < 0)
+-    {
+-	cst_errmsg("alsa_audio params setting failed: %s\n",snd_strerror(err));
+-	snd_pcm_close(pcm);	
+-	cst_error();
+-    }
+-    if((err = snd_pcm_plugin_setup(pcm,SND_PCM_CHANNEL_PLAYBACK)) > 0) {
+-	cst_errmsg("alsa_audio sound prepare setting failed: %s\n",snd_strerror(err));
+-	snd_pcm_close(pcm);
+-	cst_error();
+-    }
+-    if((err = snd_pcm_plugin_prepare(pcm,SND_PCM_CHANNEL_PLAYBACK)) > 0) {
+-	cst_errmsg("alsa_audio sound prepare setting failed: %s\n",snd_strerror(err));
+-	snd_pcm_close(pcm);
+-	cst_error();
+-    }
++  /* Set samble format */
++  err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format);
++  if (err <0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err));
++	return NULL;
++  }
+ 
+-    pinfo.channel = SND_PCM_CHANNEL_PLAYBACK;
+-    snd_pcm_plugin_info(pcm,&pinfo);
++  /* Set sample rate near the disired rate */
++  real_rate = sps;
++  err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0);
++  if (err < 0)   
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err));
++	return NULL;
++  }
++  /*FIXME:  This is probably too strict */
++  assert(sps == real_rate);
+ 
+-    ad = cst_alloc(cst_audiodev, 1);
+-    ad->platform_data = pcm;
+-    ad->sps = ad->real_sps = sps;
+-    ad->channels = ad->real_channels = channels;
+-    ad->fmt = ad->real_fmt = fmt;
++  /* Set number of channels */
++  assert(channels >0);
++  err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err));
++	return NULL;
++  }
+ 
+-    return ad;
++  /* Commit hardware parameters */
++  err = snd_pcm_hw_params(pcm_handle, hwparams);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err));
++	return NULL;
++  }
++
++  /* Make sure the device is ready to accept data */
++  assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED);
++
++  /* Write hardware parameters to flite audio device data structure */
++  ad = cst_alloc(cst_audiodev, 1);
++  assert(ad != NULL);
++  ad->real_sps = ad->sps = sps;
++  ad->real_channels = ad->channels = channels;
++  ad->real_fmt = ad->fmt = fmt;
++  ad->platform_data = (void *) pcm_handle;
++
++  return ad;
+ }
+ 
+ int audio_close_alsa(cst_audiodev *ad)
+ {
+-    snd_pcm_t *pcm;
++  int result;
++  snd_pcm_t *pcm_handle;
+ 
+-    if (ad == NULL)
+-	    return 0;
++  if (ad == NULL)
++	return 0;
+ 
+-    pcm = ad->platform_data;
+-    snd_pcm_plugin_flush(pcm,0);
+-    snd_pcm_close(pcm);
+-    cst_free(ad);
++  pcm_handle = (snd_pcm_t *) ad->platform_data;
++  result = snd_pcm_close(pcm_handle);
++  if (result < 0)
++  {
++	cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result));
++  }
++  cst_free(ad);
++  return result;
++}
+ 
+-    return 0;
++/* Returns zero if recovery was successful. */
++static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res)
++{
++  if (res == -EPIPE) /* xrun */
++  {
++	res = snd_pcm_prepare(pcm_handle);
++	if (res < 0) 
++	{
++	  /* Failed to recover from xrun */
++	  cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res));
++	  return res;
++	}
++  } 
++  else if (res == -ESTRPIPE) /* Suspend */
++  {
++	while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) 
++	{
++	  snd_pcm_wait(pcm_handle, 1000);
++	}
++	if (res < 0) 
++	{
++	  res = snd_pcm_prepare(pcm_handle);
++	  if (res <0) 
++	  {
++		/* Resume failed */
++		cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res));
++		return res;
++	  }
++	}
++  } 
++  else if (res < 0) 
++  {
++	/* Unknown failure */
++	cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res));
++	return res;
++  }
++  return 0;
+ }
+ 
+ int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes)
+ {
+-    snd_pcm_t *pcm = ad->platform_data;
++  size_t frame_size;
++  ssize_t num_frames, res;
++  snd_pcm_t *pcm_handle;
++  char *buf = (char *) samples;
+ 
+-    return snd_pcm_plugin_write(pcm,samples,num_bytes);
++  /* Determine frame size in bytes */
++  frame_size  = audio_bps(ad->real_fmt) * ad->real_channels;
++  /* Require that only complete frames are handed in */
++  assert((num_bytes % frame_size) == 0);
++  num_frames = num_bytes / frame_size;
++  pcm_handle = (snd_pcm_t *) ad->platform_data;
++
++  while (num_frames > 0) 
++  {
++	res = snd_pcm_writei(pcm_handle, buf, num_frames);
++	if (res != num_frames) 
++	{
++	  if (res == -EAGAIN || (res > 0 && res < num_frames)) 
++	  {
++		snd_pcm_wait(pcm_handle, 100);
++	  }
++	  else if (recover_from_error(pcm_handle, res) < 0) 
++	  {
++		return -1;
++	  }
++	}
++
++	if (res >0) 
++	{
++	  num_frames -= res;
++	  buf += res * frame_size;
++	}
++  }
++  return num_bytes;
+ }
+ 
+ int audio_flush_alsa(cst_audiodev *ad)
+ {
+-    snd_pcm_t *pcm = ad->platform_data;
+-
+-    return snd_pcm_plugin_flush(pcm,0);
++  int result;
++  result = snd_pcm_drain((snd_pcm_t *) ad->platform_data);
++  if (result < 0)
++  {
++	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
++  }
++	/* Prepare device for more data */
++  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
++if (result < 0)
++  {
++	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
++  }
++  return result;
+ }
+ 
+ int audio_drain_alsa(cst_audiodev *ad)
+ {
+-    snd_pcm_t *pcm = ad->platform_data;
+-
+-    return snd_pcm_plugin_playback_drain(pcm);
++  int result;
++  result = snd_pcm_drop((snd_pcm_t *) ad->platform_data);
++  if (result < 0)
++  {
++	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
++  }
++/* Prepare device for more data */
++  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
++if (result < 0)
++  {
++	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
++  }
++  return result;
+ }
+-
+Index: doc/Makefile
+===================================================================
+--- flite-1.2-release/doc/Makefile	(.../flite-1.2-orig)	(revision 10)
++++ flite-1.2-release/doc/Makefile	(.../release-v1.2)	(revision 10)
+@@ -53,6 +53,7 @@
+ 	@ if [ ! -d html ] ; \
+           then mkdir -p html ; fi
+ 	(cd html; texi2html -number -split_chapter ../flite.texi)
++	mv html/flite/*.html html/ && rmdir html/flite
+ 	@ for i in html/*.html ; \
+ 	  do \
+ 	    sed 's/<BODY>/<BODY bgcolor="#ffffff">/' $$i >ttt.html; \
+Index: config/common_make_rules
+===================================================================
+--- flite-1.2-release/config/common_make_rules	(.../flite-1.2-orig)	(revision 10)
++++ flite-1.2-release/config/common_make_rules	(.../release-v1.2)	(revision 10)
+@@ -88,7 +88,7 @@
+ 	@ rm -rf shared_os && mkdir shared_os
+ 	@ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} 
+ 	@ (cd shared_os && ar x ../$<)
+-	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
++	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(AUDIOLIBS))
+ 	@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
+ 	@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+ 	@ rm -rf shared_os
diff --git a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty b/packages/flite/flite-1.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty
+++ b/packages/flite/flite-1.3/.mtn2git_empty
diff --git a/packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff b/packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff
new file mode 100644
index 0000000000..b3e4b7aae4
--- /dev/null
+++ b/packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff
@@ -0,0 +1,6615 @@
+Index: lang/usenglish/Makefile
+===================================================================
+--- flite-1.3-release/lang/usenglish/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/usenglish/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,6 +38,7 @@
+ DIRNAME=lang/usenglish
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \
+     us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h
+ SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \
+@@ -45,7 +46,11 @@
+        us_phoneset.c us_ffeatures.c us_phrasing_cart.c \
+        us_gpos.c us_text.c us_expand.c us_postlex.c \
+        us_nums_cart.c us_aswd.c usenglish.c 
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_usenglish
+Index: lang/cmu_us_kal/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_us_kal/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmu_us_kal/Makefile	(.../release-1.2)	(revision 7)
+@@ -43,7 +43,12 @@
+        cmu_us_kal_lpc.c \
+        cmu_us_kal_res.c \
+        cmu_us_kal_residx.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_us_kal
+Index: lang/cmu_us_kal16/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_us_kal16/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmu_us_kal16/Makefile	(.../release-1.2)	(revision 7)
+@@ -44,7 +44,12 @@
+        cmu_us_kal16_lpc.c \
+        cmu_us_kal16_res.c \
+        cmu_us_kal16_residx.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_us_kal16
+Index: lang/cmu_time_awb/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_time_awb/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmu_time_awb/Makefile	(.../release-1.2)	(revision 7)
+@@ -45,7 +45,12 @@
+ 	cmu_time_awb_mcep.c \
+ 	cmu_time_awb_lpc.c \
+ 	cmu_time_awb_lex_entry.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_time_awb
+Index: lang/cmulex/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmulex/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmulex/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,13 +38,20 @@
+ DIRNAME=lang/cmulex
+ BUILD_DIRS = 
+ ALL_DIRS= 
++
+ H = cmu_lts_model.h cmulex.h
+ SRCS = cmu_lts_rules.c cmu_lts_model.c \
+        cmu_lex.c cmu_lex_entries.c cmu_lex_data.c
+ LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \
+      cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c
+ 
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
++
+ SCRIPTS=make_cmulex  
+ 
+ SCM=
+Index: configure
+===================================================================
+--- flite-1.3-release/configure	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/configure	(.../release-1.2)	(revision 7)
+@@ -1,324 +1,38 @@
+ #! /bin/sh
++
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.57.
++# Generated automatically using autoconf version 2.13 
++# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+ #
+-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
+ 
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
+-fi
+-
+-# Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
+-
+-
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    $as_unset $as_var
+-  fi
+-done
+-
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+-  as_basename=basename
+-else
+-  as_basename=false
+-fi
+-
+-
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
+-
+-
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+-
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
+-
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
+-    sed '
+-      N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+-      t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
+-    ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+-   { (exit 1); exit 1; }; }
+-
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
+-  # Exit status is that of the last command.
+-  exit
+-}
+-
+-
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
+-
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+-else
+-  as_ln_s='cp -p'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.file
+-
+-if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
+-else
+-  as_mkdir_p=false
+-fi
+-
+-as_executable_p="test -f"
+-
+-# Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+-
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+-
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+-
+-# Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# so uname gets run too.
+-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+-
+-exec 6>&1
+-
+-#
+-# Initializations.
+-#
++# Defaults:
++ac_help=
+ ac_default_prefix=/usr/local
+-ac_config_libobj_dir=.
+-cross_compiling=no
+-subdirs=
+-MFLAGS=
+-MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
++# Any additions from configure.in:
++ac_help="$ac_help
++  --disable-shared     without shared library support"
++ac_help="$ac_help
++  --disable-sockets     without socket support"
++ac_help="$ac_help
++  --with-audio          with specific audio support (none linux freebsd etc) "
++ac_help="$ac_help
++  --with-lang           with language "
++ac_help="$ac_help
++  --with-vox            with vox "
++ac_help="$ac_help
++  --with-lex            with lexicon "
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+-# Identity of this package.
+-PACKAGE_NAME=
+-PACKAGE_TARNAME=
+-PACKAGE_VERSION=
+-PACKAGE_STRING=
+-PACKAGE_BUGREPORT=
+-
+-ac_unique_file="include/flite.h"
+-# Factoring default headers for most tests.
+-ac_includes_default="\
+-#include <stdio.h>
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-#if HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-#if STDC_HEADERS
+-# include <stdlib.h>
+-# include <stddef.h>
+-#else
+-# if HAVE_STDLIB_H
+-#  include <stdlib.h>
+-# endif
+-#endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#endif
+-#if HAVE_STRINGS_H
+-# include <strings.h>
+-#endif
+-#if HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+-#endif
+-#if HAVE_UNISTD_H
+-# include <unistd.h>
+-#endif"
+-
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR ac_ct_AR TARGET_OS TARGET_CPU M68KCC LEXDEFS VOXDEFS HOST_OS HOST_CPU OTHERLIBS SHFLAGS MMAPTYPE STDIOTYPE CPP EGREP AUDIODRIVER AUDIODEFS AUDIOLIBS FL_LANG FL_VOX FL_LEX LIBOBJS LTLIBOBJS'
+-ac_subst_files=''
+-
+ # Initialize some variables set by options.
+-ac_init_help=
+-ac_init_version=false
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+-cache_file=/dev/null
++build=NONE
++cache_file=./config.cache
+ exec_prefix=NONE
++host=NONE
+ no_create=
++nonopt=NONE
+ no_recursion=
+ prefix=NONE
+ program_prefix=NONE
+@@ -327,15 +41,10 @@
+ silent=
+ site=
+ srcdir=
++target=NONE
+ verbose=
+ x_includes=NONE
+ x_libraries=NONE
+-
+-# Installation directory options.
+-# These are left unexpanded so users can "make install exec_prefix=/foo"
+-# and all the variables that are supposed to be based on exec_prefix
+-# by default will actually change.
+-# Use braces instead of parens because sh, perl, etc. also accept them.
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+@@ -349,9 +58,17 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++# Initialize some other variables.
++subdirs=
++MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++# Maximum number of lines to put in a shell here document.
++ac_max_here_lines=12
++
+ ac_prev=
+ for ac_option
+ do
++
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+     eval "$ac_prev=\$ac_option"
+@@ -359,59 +76,59 @@
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case "$ac_option" in
++  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) ac_optarg= ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case "$ac_option" in
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+-    bindir=$ac_optarg ;;
++    bindir="$ac_optarg" ;;
+ 
+   -build | --build | --buil | --bui | --bu)
+-    ac_prev=build_alias ;;
++    ac_prev=build ;;
+   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+-    build_alias=$ac_optarg ;;
++    build="$ac_optarg" ;;
+ 
+   -cache-file | --cache-file | --cache-fil | --cache-fi \
+   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+     ac_prev=cache_file ;;
+   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+-    cache_file=$ac_optarg ;;
++    cache_file="$ac_optarg" ;;
+ 
+-  --config-cache | -C)
+-    cache_file=config.cache ;;
+-
+   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+     ac_prev=datadir ;;
+   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+   | --da=*)
+-    datadir=$ac_optarg ;;
++    datadir="$ac_optarg" ;;
+ 
+   -disable-* | --disable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    eval "enable_${ac_feature}=no" ;;
+ 
+   -enable-* | --enable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
++    fi
++    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
++    case "$ac_option" in
++      *=*) ;;
+       *) ac_optarg=yes ;;
+     esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval "enable_${ac_feature}='$ac_optarg'" ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -420,47 +137,95 @@
+   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+   | --exec=* | --exe=* | --ex=*)
+-    exec_prefix=$ac_optarg ;;
++    exec_prefix="$ac_optarg" ;;
+ 
+   -gas | --gas | --ga | --g)
+     # Obsolete; use --with-gas.
+     with_gas=yes ;;
+ 
+-  -help | --help | --hel | --he | -h)
+-    ac_init_help=long ;;
+-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+-    ac_init_help=recursive ;;
+-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+-    ac_init_help=short ;;
++  -help | --help | --hel | --he)
++    # Omit some internal or obsolete options to make the list less imposing.
++    # This message is too long to be a string in the A/UX 3.1 sh.
++    cat << EOF
++Usage: configure [options] [host]
++Options: [defaults in brackets after descriptions]
++Configuration:
++  --cache-file=FILE       cache test results in FILE
++  --help                  print this message
++  --no-create             do not create output files
++  --quiet, --silent       do not print \`checking...' messages
++  --version               print the version of autoconf that created configure
++Directory and file names:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++                          [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++                          [same as prefix]
++  --bindir=DIR            user executables in DIR [EPREFIX/bin]
++  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
++  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
++  --datadir=DIR           read-only architecture-independent data in DIR
++                          [PREFIX/share]
++  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
++                          [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
++  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
++  --includedir=DIR        C header files in DIR [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
++  --infodir=DIR           info documentation in DIR [PREFIX/info]
++  --mandir=DIR            man documentation in DIR [PREFIX/man]
++  --srcdir=DIR            find the sources in DIR [configure dir or ..]
++  --program-prefix=PREFIX prepend PREFIX to installed program names
++  --program-suffix=SUFFIX append SUFFIX to installed program names
++  --program-transform-name=PROGRAM
++                          run sed PROGRAM on installed program names
++EOF
++    cat << EOF
++Host type:
++  --build=BUILD           configure for building on BUILD [BUILD=HOST]
++  --host=HOST             configure for HOST [guessed]
++  --target=TARGET         configure for TARGET [TARGET=HOST]
++Features and packages:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --x-includes=DIR        X include files are in DIR
++  --x-libraries=DIR       X library files are in DIR
++EOF
++    if test -n "$ac_help"; then
++      echo "--enable and --with options recognized:$ac_help"
++    fi
++    exit 0 ;;
+ 
+   -host | --host | --hos | --ho)
+-    ac_prev=host_alias ;;
++    ac_prev=host ;;
+   -host=* | --host=* | --hos=* | --ho=*)
+-    host_alias=$ac_optarg ;;
++    host="$ac_optarg" ;;
+ 
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+   | --includ=* | --inclu=* | --incl=* | --inc=*)
+-    includedir=$ac_optarg ;;
++    includedir="$ac_optarg" ;;
+ 
+   -infodir | --infodir | --infodi | --infod | --info | --inf)
+     ac_prev=infodir ;;
+   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+-    infodir=$ac_optarg ;;
++    infodir="$ac_optarg" ;;
+ 
+   -libdir | --libdir | --libdi | --libd)
+     ac_prev=libdir ;;
+   -libdir=* | --libdir=* | --libdi=* | --libd=*)
+-    libdir=$ac_optarg ;;
++    libdir="$ac_optarg" ;;
+ 
+   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+   | --libexe | --libex | --libe)
+     ac_prev=libexecdir ;;
+   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+   | --libexe=* | --libex=* | --libe=*)
+-    libexecdir=$ac_optarg ;;
++    libexecdir="$ac_optarg" ;;
+ 
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+   | --localstate | --localstat | --localsta | --localst \
+@@ -469,19 +234,19 @@
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+-    localstatedir=$ac_optarg ;;
++    localstatedir="$ac_optarg" ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+     ac_prev=mandir ;;
+   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+-    mandir=$ac_optarg ;;
++    mandir="$ac_optarg" ;;
+ 
+   -nfp | --nfp | --nf)
+     # Obsolete; use --without-fp.
+     with_fp=no ;;
+ 
+   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c | -n)
++  | --no-cr | --no-c)
+     no_create=yes ;;
+ 
+   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+@@ -495,26 +260,26 @@
+   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+-    oldincludedir=$ac_optarg ;;
++    oldincludedir="$ac_optarg" ;;
+ 
+   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+     ac_prev=prefix ;;
+   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+-    prefix=$ac_optarg ;;
++    prefix="$ac_optarg" ;;
+ 
+   -program-prefix | --program-prefix | --program-prefi | --program-pref \
+   | --program-pre | --program-pr | --program-p)
+     ac_prev=program_prefix ;;
+   -program-prefix=* | --program-prefix=* | --program-prefi=* \
+   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+-    program_prefix=$ac_optarg ;;
++    program_prefix="$ac_optarg" ;;
+ 
+   -program-suffix | --program-suffix | --program-suffi | --program-suff \
+   | --program-suf | --program-su | --program-s)
+     ac_prev=program_suffix ;;
+   -program-suffix=* | --program-suffix=* | --program-suffi=* \
+   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+-    program_suffix=$ac_optarg ;;
++    program_suffix="$ac_optarg" ;;
+ 
+   -program-transform-name | --program-transform-name \
+   | --program-transform-nam | --program-transform-na \
+@@ -531,7 +296,7 @@
+   | --program-transfo=* | --program-transf=* \
+   | --program-trans=* | --program-tran=* \
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+-    program_transform_name=$ac_optarg ;;
++    program_transform_name="$ac_optarg" ;;
+ 
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+@@ -541,7 +306,7 @@
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+   | --sbi=* | --sb=*)
+-    sbindir=$ac_optarg ;;
++    sbindir="$ac_optarg" ;;
+ 
+   -sharedstatedir | --sharedstatedir | --sharedstatedi \
+   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+@@ -552,57 +317,58 @@
+   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+   | --sha=* | --sh=*)
+-    sharedstatedir=$ac_optarg ;;
++    sharedstatedir="$ac_optarg" ;;
+ 
+   -site | --site | --sit)
+     ac_prev=site ;;
+   -site=* | --site=* | --sit=*)
+-    site=$ac_optarg ;;
++    site="$ac_optarg" ;;
+ 
+   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+     ac_prev=srcdir ;;
+   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+-    srcdir=$ac_optarg ;;
++    srcdir="$ac_optarg" ;;
+ 
+   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+   | --syscon | --sysco | --sysc | --sys | --sy)
+     ac_prev=sysconfdir ;;
+   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+-    sysconfdir=$ac_optarg ;;
++    sysconfdir="$ac_optarg" ;;
+ 
+   -target | --target | --targe | --targ | --tar | --ta | --t)
+-    ac_prev=target_alias ;;
++    ac_prev=target ;;
+   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+-    target_alias=$ac_optarg ;;
++    target="$ac_optarg" ;;
+ 
+   -v | -verbose | --verbose | --verbos | --verbo | --verb)
+     verbose=yes ;;
+ 
+-  -version | --version | --versio | --versi | --vers | -V)
+-    ac_init_version=: ;;
++  -version | --version | --versio | --versi | --vers)
++    echo "configure generated by autoconf version 2.13"
++    exit 0 ;;
+ 
+   -with-* | --with-*)
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+-   { (exit 1); exit 1; }; }
++    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++    case "$ac_option" in
++      *=*) ;;
+       *) ac_optarg=yes ;;
+     esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval "with_${ac_package}='$ac_optarg'" ;;
+ 
+   -without-* | --without-*)
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
++      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
++    fi
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    eval "with_${ac_package}=no" ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -613,110 +379,99 @@
+     ac_prev=x_includes ;;
+   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+-    x_includes=$ac_optarg ;;
++    x_includes="$ac_optarg" ;;
+ 
+   -x-libraries | --x-libraries | --x-librarie | --x-librari \
+   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+     ac_prev=x_libraries ;;
+   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+-    x_libraries=$ac_optarg ;;
++    x_libraries="$ac_optarg" ;;
+ 
+-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2
+-   { (exit 1); exit 1; }; }
++  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+     ;;
+ 
+-  *=*)
+-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
+-    export $ac_envvar ;;
+-
+   *)
+-    # FIXME: should be removed in autoconf 3.0.
+-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
++      echo "configure: warning: $ac_option: invalid host type" 1>&2
++    fi
++    if test "x$nonopt" != xNONE; then
++      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
++    fi
++    nonopt="$ac_option"
+     ;;
+ 
+   esac
+ done
+ 
+ if test -n "$ac_prev"; then
+-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { echo "$as_me: error: missing argument to $ac_option" >&2
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
+-  esac
+-done
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+ 
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-              localstatedir libdir includedir oldincludedir infodir mandir
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 6 checking for... messages and results
++# 5 compiler messages saved in config.log
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>./config.log
++
++echo "\
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++" 1>&5
++
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Also quote any args containing shell metacharacters.
++ac_configure_args=
++for ac_arg
+ do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++  case "$ac_arg" in
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c) ;;
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
++  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
++  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+   esac
+ done
+ 
+-# There might be people who depend on the old broken behavior: `$host'
+-# used to hold the argument of --host etc.
+-# FIXME: To remove some day.
+-build=$build_alias
+-host=$host_alias
+-target=$target_alias
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+ 
+-# FIXME: To remove some day.
+-if test "x$host_alias" != x; then
+-  if test "x$build_alias" = x; then
+-    cross_compiling=maybe
+-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
+-  elif test "x$build_alias" != "x$host_alias"; then
+-    cross_compiling=yes
+-  fi
+-fi
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo > confdefs.h
+ 
+-ac_tool_prefix=
+-test -n "$host_alias" && ac_tool_prefix=$host_alias-
++# A filename unique to this package, relative to the directory that
++# configure is in, which we can look for to find out if srcdir is correct.
++ac_unique_file=include/flite.h
+ 
+-test "$silent" = yes && exec 6>/dev/null
+-
+-
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+   # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$0" : 'X\(//\)[^/]' \| \
+-         X"$0" : 'X\(//\)$' \| \
+-         X"$0" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
+-echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++  ac_prog=$0
++  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
++  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+   srcdir=$ac_confdir
+   if test ! -r $srcdir/$ac_unique_file; then
+     srcdir=..
+@@ -726,441 +481,13 @@
+ fi
+ if test ! -r $srcdir/$ac_unique_file; then
+   if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
++    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+   else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
++    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+   fi
+ fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
++srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+ 
+-#
+-# Report the --help message.
+-#
+-if test "$ac_init_help" = "long"; then
+-  # Omit some internal or obsolete options to make the list less imposing.
+-  # This message is too long to be a string in the A/UX 3.1 sh.
+-  cat <<_ACEOF
+-\`configure' configures this package to adapt to many kinds of systems.
+-
+-Usage: $0 [OPTION]... [VAR=VALUE]...
+-
+-To assign environment variables (e.g., CC, CFLAGS...), specify them as
+-VAR=VALUE.  See below for descriptions of some of the useful variables.
+-
+-Defaults for the options are specified in brackets.
+-
+-Configuration:
+-  -h, --help              display this help and exit
+-      --help=short        display options specific to this package
+-      --help=recursive    display the short help of all the included packages
+-  -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
+-      --cache-file=FILE   cache test results in FILE [disabled]
+-  -C, --config-cache      alias for \`--cache-file=config.cache'
+-  -n, --no-create         do not create output files
+-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+-
+-_ACEOF
+-
+-  cat <<_ACEOF
+-Installation directories:
+-  --prefix=PREFIX         install architecture-independent files in PREFIX
+-                          [$ac_default_prefix]
+-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-                          [PREFIX]
+-
+-By default, \`make install' will install all the files in
+-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+-for instance \`--prefix=\$HOME'.
+-
+-For better control, use the options below.
+-
+-Fine tuning of the installation directories:
+-  --bindir=DIR           user executables [EPREFIX/bin]
+-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR           object code libraries [EPREFIX/lib]
+-  --includedir=DIR       C header files [PREFIX/include]
+-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
+-_ACEOF
+-
+-  cat <<\_ACEOF
+-
+-System types:
+-  --build=BUILD     configure for building on BUILD [guessed]
+-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+-  --target=TARGET   configure for building compilers for TARGET [HOST]
+-_ACEOF
+-fi
+-
+-if test -n "$ac_init_help"; then
+-
+-  cat <<\_ACEOF
+-
+-Optional Features:
+-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --disable-shared     without shared library support
+-  --disable-sockets     without socket support
+-
+-Optional Packages:
+-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-audio          with specific audio support (none linux freebsd etc)
+-  --with-lang           with language
+-  --with-vox            with vox
+-  --with-lex            with lexicon
+-
+-Some influential environment variables:
+-  CC          C compiler command
+-  CFLAGS      C compiler flags
+-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+-              nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
+-  CPP         C preprocessor
+-
+-Use these variables to override the choices made by `configure' or to help
+-it to find libraries and programs with nonstandard names/locations.
+-
+-_ACEOF
+-fi
+-
+-if test "$ac_init_help" = "recursive"; then
+-  # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
+-    ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-           test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
+-    else
+-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi
+-    cd $ac_popdir
+-  done
+-fi
+-
+-test -n "$ac_init_help" && exit 0
+-if $ac_init_version; then
+-  cat <<\_ACEOF
+-
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
+-_ACEOF
+-  exit 0
+-fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+-
+-It was created by $as_me, which was
+-generated by GNU Autoconf 2.57.  Invocation command line was
+-
+-  $ $0 $@
+-
+-_ACEOF
+-{
+-cat <<_ASUNAME
+-## --------- ##
+-## Platform. ##
+-## --------- ##
+-
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+-
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+-
+-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+-
+-_ASUNAME
+-
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  echo "PATH: $as_dir"
+-done
+-
+-} >&5
+-
+-cat >&5 <<_ACEOF
+-
+-
+-## ----------- ##
+-## Core tests. ##
+-## ----------- ##
+-
+-_ACEOF
+-
+-
+-# Keep a trace of the command line.
+-# Strip out --no-create and --no-recursion so they do not pile up.
+-# Strip out --silent because we don't want to record it for future runs.
+-# Also quote any args containing shell meta-characters.
+-# Make two passes to allow for proper duplicate-argument suppression.
+-ac_configure_args=
+-ac_configure_args0=
+-ac_configure_args1=
+-ac_sep=
+-ac_must_keep_next=false
+-for ac_pass in 1 2
+-do
+-  for ac_arg
+-  do
+-    case $ac_arg in
+-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+-    | -silent | --silent | --silen | --sile | --sil)
+-      continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    esac
+-    case $ac_pass in
+-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+-    2)
+-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+-      if test $ac_must_keep_next = true; then
+-        ac_must_keep_next=false # Got value, back to normal.
+-      else
+-        case $ac_arg in
+-          *=* | --config-cache | -C | -disable-* | --disable-* \
+-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+-          | -with-* | --with-* | -without-* | --without-* | --x)
+-            case "$ac_configure_args0 " in
+-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+-            esac
+-            ;;
+-          -* ) ac_must_keep_next=true ;;
+-        esac
+-      fi
+-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-      # Get rid of the leading space.
+-      ac_sep=" "
+-      ;;
+-    esac
+-  done
+-done
+-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+-
+-# When interrupted or exit'd, cleanup temporary files, and complete
+-# config.log.  We remove comments because anyway the quotes in there
+-# would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
+-trap 'exit_status=$?
+-  # Save into config.log some information that might help in debugging.
+-  {
+-    echo
+-
+-    cat <<\_ASBOX
+-## ---------------- ##
+-## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
+-    echo
+-    # The following way of writing the cache mishandles newlines in values,
+-{
+-  (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      sed -n \
+-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
+-    *)
+-      sed -n \
+-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-}
+-    echo
+-
+-    cat <<\_ASBOX
+-## ----------------- ##
+-## Output variables. ##
+-## ----------------- ##
+-_ASBOX
+-    echo
+-    for ac_var in $ac_subst_vars
+-    do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
+-    done | sort
+-    echo
+-
+-    if test -n "$ac_subst_files"; then
+-      cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
+-_ASBOX
+-      echo
+-      for ac_var in $ac_subst_files
+-      do
+-	eval ac_val=$`echo $ac_var`
+-        echo "$ac_var='"'"'$ac_val'"'"'"
+-      done | sort
+-      echo
+-    fi
+-
+-    if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
+-## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
+-      echo
+-      sed "/^$/d" confdefs.h | sort
+-      echo
+-    fi
+-    test "$ac_signal" != 0 &&
+-      echo "$as_me: caught signal $ac_signal"
+-    echo "$as_me: exit $exit_status"
+-  } >&5
+-  rm -f core core.* *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+-    exit $exit_status
+-     ' 0
+-for ac_signal in 1 2 13 15; do
+-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+-done
+-ac_signal=0
+-
+-# confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
+-
+-# Predefined preprocessor variables.
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_NAME "$PACKAGE_NAME"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_VERSION "$PACKAGE_VERSION"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_STRING "$PACKAGE_STRING"
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+-_ACEOF
+-
+-
+-# Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -z "$CONFIG_SITE"; then
+   if test "x$prefix" != xNONE; then
+@@ -1171,106 +498,42 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-echo "$as_me: loading site script $ac_site_file" >&6;}
+-    sed 's/^/| /' "$ac_site_file" >&5
++    echo "loading site script $ac_site_file"
+     . "$ac_site_file"
+   fi
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
+-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
+-    case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
+-    esac
+-  fi
++  echo "loading cache $cache_file"
++  . $cache_file
+ else
+-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
+-  >$cache_file
++  echo "creating cache $cache_file"
++  > $cache_file
+ fi
+ 
+-# Check that the precious variables saved in the cache have kept the same
+-# value.
+-ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+-  eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
+-  case $ac_old_set,$ac_new_set in
+-    set,)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+-      ac_cache_corrupted=: ;;
+-    ,set)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+-      ac_cache_corrupted=: ;;
+-    ,);;
+-    *)
+-      if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+-echo "$as_me:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+-echo "$as_me:   current value: $ac_new_val" >&2;}
+-        ac_cache_corrupted=:
+-      fi;;
+-  esac
+-  # Pass precious variables to config.status.
+-  if test "$ac_new_set" = set; then
+-    case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+-    *) ac_arg=$ac_var=$ac_new_val ;;
+-    esac
+-    case " $ac_configure_args " in
+-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+-    esac
+-  fi
+-done
+-if $ac_cache_corrupted; then
+-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+ ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
++ac_exeext=
++ac_objext=o
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
+ 
+ 
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then
+@@ -1281,740 +544,312 @@
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+-  elif test -f $ac_dir/shtool; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/shtool install -c"
+-    break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ 
+-# Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+-   { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+-if test "${ac_cv_build+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+-   { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++# Do some error checking and defaulting for the host and target type.
++# The inputs are:
++#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
++#
++# The rules are:
++# 1. You are not allowed to specify --host, --target, and nonopt at the
++#    same time.
++# 2. Host defaults to nonopt.
++# 3. If nonopt is not specified, then host defaults to the current host,
++#    as determined by config.guess.
++# 4. Target and build default to nonopt.
++# 5. If nonopt is not specified, then target and build default to host.
+ 
++# The aliases save the names the user supplied, while $host etc.
++# will get canonicalized.
++case $host---$target---$nonopt in
++NONE---*---* | *---NONE---* | *---*---NONE) ;;
++*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
++esac
++
++
++# Make sure we can run config.sub.
++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
++else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
+-build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
++echo $ac_n "checking host system type""... $ac_c" 1>&6
++echo "configure:585: checking host system type" >&5
+ 
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+-if test "${ac_cv_host+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++host_alias=$host
++case "$host_alias" in
++NONE)
++  case $nonopt in
++  NONE)
++    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
++    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
++    fi ;;
++  *) host_alias=$nonopt ;;
++  esac ;;
++esac
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
+-host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$host" 1>&6
+ 
++echo $ac_n "checking target system type""... $ac_c" 1>&6
++echo "configure:606: checking target system type" >&5
+ 
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
+-if test "${ac_cv_target+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+-  ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++target_alias=$target
++case "$target_alias" in
++NONE)
++  case $nonopt in
++  NONE) target_alias=$host_alias ;;
++  *) target_alias=$nonopt ;;
++  esac ;;
++esac
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
+-target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
++target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$target" 1>&6
+ 
++echo $ac_n "checking build system type""... $ac_c" 1>&6
++echo "configure:624: checking build system type" >&5
+ 
+-# The aliases save the names the user supplied, while $host etc.
+-# will get canonicalized.
+-test -n "$target_alias" &&
++build_alias=$build
++case "$build_alias" in
++NONE)
++  case $nonopt in
++  NONE) build_alias=$host_alias ;;
++  *) build_alias=$nonopt ;;
++  esac ;;
++esac
++
++build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
++build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$build" 1>&6
++
++test "$host_alias" != "$target_alias" &&
+   test "$program_prefix$program_suffix$program_transform_name" = \
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+ 
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "gcc", so it can be a program name with args.
++# Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:649: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="gcc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
+ fi
+ fi
+-CC=$ac_cv_prog_CC
++CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  echo "$ac_t""$CC" 1>&6
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+-
+-fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:679: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+-       ac_prog_rejected=yes
+-       continue
+-     fi
+-    ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++        ac_prog_rejected=yes
++	continue
++      fi
++      ac_cv_prog_CC="cc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+   set dummy $ac_cv_prog_CC
+   shift
+-  if test $# != 0; then
++  if test $# -gt 0; then
+     # We chose a different compiler from the bogus one.
+     # However, it has the same basename, so the bogon will be chosen
+     # first if we set CC to just the basename; use the full file name.
+     shift
+-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++    set dummy "$ac_dir/$ac_word" "$@"
++    shift
++    ac_cv_prog_CC="$@"
+   fi
+ fi
+ fi
+ fi
+-CC=$ac_cv_prog_CC
++CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  echo "$ac_t""$CC" 1>&6
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-fi
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:730: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
+ fi
+ fi
+-CC=$ac_cv_prog_CC
++CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  echo "$ac_t""$CC" 1>&6
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
+ fi
+-
+-    test -n "$CC" && break
+-  done
+-fi
+-if test -z "$CC"; then
+-  ac_ct_CC=$CC
+-  for ac_prog in cl
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
++ ;;
++    esac
+   fi
+-done
+-done
+-
++  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ 
+-  test -n "$ac_ct_CC" && break
+-done
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+-  CC=$ac_ct_CC
+-fi
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
+-fi
++cat > conftest.$ac_ext << EOF
+ 
++#line 773 "configure"
++#include "confdefs.h"
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-# Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+-# Try to create an executable without -o first, disregard a.out.
+-# It will help us diagnose broken compilers, and finding out an intuition
+-# of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output" >&5
+-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+-do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-        ;;
+-    conftest.$ac_ext )
+-        # This is the source file.
+-        ;;
+-    [ab].out )
+-        # We found the default executable, but exeext='' is most
+-        # certainly right.
+-        break;;
+-    *.* )
+-        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-        # FIXME: I believe we export ac_cv_exeext for Libtool,
+-        # but it would be cool to find out if it's true.  Does anybody
+-        # maintain Libtool? --akim.
+-        export ac_cv_exeext
+-        break;;
+-    * )
+-        break;;
+-  esac
+-done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }
+-fi
+-
+-ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-    cross_compiling=no
++main(){return(0);}
++EOF
++if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  ac_cv_prog_cc_works=yes
++  # If we can't run a trivial program, we are probably using a cross compiler.
++  if (./conftest; exit) 2>/dev/null; then
++    ac_cv_prog_cc_cross=no
+   else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
++    ac_cv_prog_cc_cross=yes
+   fi
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_works=no
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          export ac_cv_exeext
+-          break;;
+-    * ) break;;
+-  esac
+-done
+-else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
+ 
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+-
+-rm -f conftest.$ac_ext
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:809: checking whether we are using GNU C" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+-       break;;
+-  esac
+-done
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
++#endif
++EOF
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_gcc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  ac_cv_prog_gcc=no
+ fi
+-
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
+-OBJEXT=$ac_cv_objext
+-ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-int
+-main ()
+-{
+-#ifndef __GNUC__
+-       choke me
+-#endif
++echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_compiler_gnu=yes
++if test $ac_cv_prog_gcc = yes; then
++  GCC=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_compiler_gnu=no
++  GCC=
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:837: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  echo 'void f(){}' > conftest.c
++if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_prog_cc_g=no
++fi
++rm -f conftest*
+ 
+-ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+ if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
++  CFLAGS="$ac_save_CFLAGS"
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+     CFLAGS="-g -O2"
+@@ -2028,304 +863,37 @@
+     CFLAGS=
+   fi
+ fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
++# Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:871: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_RANLIB="ranlib"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+ fi
+ fi
+-RANLIB=$ac_cv_prog_RANLIB
++RANLIB="$ac_cv_prog_RANLIB"
+ if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++  echo "$ac_t""$RANLIB" 1>&6
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+-  ac_ct_RANLIB=$RANLIB
+-  # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_RANLIB"; then
+-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  RANLIB=$ac_ct_RANLIB
+-else
+-  RANLIB="$ac_cv_prog_RANLIB"
+-fi
+-
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -2333,306 +901,158 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
+-# AmigaOS /C/install, which installs bootblocks on floppy discs
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++echo "configure:910: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in
+-  ./ | .// | /cC/* | \
+-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+-  /usr/ucb/* ) ;;
+-  *)
+-    # OSF1 and SCO ODT 3.0 have their own names for install.
+-    # Don't use installbsd from OSF since it installs stuff as root
+-    # by default.
+-    for ac_prog in ginstall scoinst install; do
+-      for ac_exec_ext in '' $ac_executable_extensions; do
+-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-          if test $ac_prog = install &&
+-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-            # AIX install.  It has an incompatible calling convention.
+-            :
+-          elif test $ac_prog = install &&
+-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-            # program-specific install script used by HP pwplus--don't use.
+-            :
+-          else
+-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-            break 3
+-          fi
+-        fi
++    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
++  for ac_dir in $PATH; do
++    # Account for people who put trailing slashes in PATH elements.
++    case "$ac_dir/" in
++    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    *)
++      # OSF1 and SCO ODT 3.0 have their own names for install.
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
++        if test -f $ac_dir/$ac_prog; then
++	  if test $ac_prog = install &&
++            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  else
++	    ac_cv_path_install="$ac_dir/$ac_prog -c"
++	    break 2
++	  fi
++	fi
+       done
+-    done
+-    ;;
+-esac
+-done
++      ;;
++    esac
++  done
++  IFS="$ac_save_IFS"
+ 
+-
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+-    INSTALL=$ac_cv_path_install
++    INSTALL="$ac_cv_path_install"
+   else
+     # As a last resort, use the slow shell script.  We don't cache a
+     # path for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the path is relative.
+-    INSTALL=$ac_install_sh
++    INSTALL="$ac_install_sh"
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++echo "$ac_t""$INSTALL" 1>&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++if test $host != $build; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AR+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:971: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_AR="${ac_tool_prefix}ar"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+ fi
+ fi
+-AR=$ac_cv_prog_AR
++AR="$ac_cv_prog_AR"
+ if test -n "$AR"; then
+-  echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++  echo "$ac_t""$AR" 1>&6
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-fi
+-if test -z "$ac_cv_prog_AR"; then
+-  ac_ct_AR=$AR
+-  # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_AR"; then
+-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_AR="ar"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+ 
+-fi
+-fi
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ 
+-  AR=$ac_ct_AR
++echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
++echo "configure:1001: checking whether byte ordering is bigendian" >&5
++if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  AR="$ac_cv_prog_AR"
+-fi
+-
+-
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+-if test "${ac_cv_c_bigendian+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # See if sys/param.h defines the BYTE_ORDER macro.
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++  ac_cv_c_bigendian=unknown
++# See if sys/param.h defines the BYTE_ORDER macro.
++cat > conftest.$ac_ext <<EOF
++#line 1008 "configure"
++#include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
++int main() {
+ 
+-int
+-main ()
+-{
+ #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+  bogus endian macros
+ #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++; return 0; }
++EOF
++if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++cat > conftest.$ac_ext <<EOF
++#line 1023 "configure"
++#include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
++int main() {
+ 
+-int
+-main ()
+-{
+ #if BYTE_ORDER != BIG_ENDIAN
+  not big endian
+ #endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++; return 0; }
++EOF
++if { (eval echo configure:1034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
+   ac_cv_c_bigendian=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_c_bigendian=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_cv_c_bigendian=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest*
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-# It does not; compile a test program.
+-if test "$cross_compiling" = yes; then
+-  # try to guess the endianness by grepping values into an object file
+-  ac_cv_c_bigendian=unknown
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+-int
+-main ()
+-{
+- _ascii (); _ebcdic ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+-  ac_cv_c_bigendian=yes
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+-  if test "$ac_cv_c_bigendian" = unknown; then
+-    ac_cv_c_bigendian=no
+-  else
+-    # finding both strings is unlikely to happen, but who knows?
+-    ac_cv_c_bigendian=unknown
+-  fi
+-fi
++rm -f conftest*
++if test $ac_cv_c_bigendian = unknown; then
++if test "$cross_compiling" = yes; then
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-int
+-main ()
+-{
++  cat > conftest.$ac_ext <<EOF
++#line 1054 "configure"
++#include "confdefs.h"
++main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+@@ -2642,52 +1062,31 @@
+   u.l = 1;
+   exit (u.c[sizeof (long) - 1] == 1);
+ }
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++EOF
++if { (eval echo configure:1067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
+   ac_cv_c_bigendian=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_c_bigendian=yes
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_c_bigendian=yes
+ fi
+-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -fr conftest*
+ fi
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+-case $ac_cv_c_bigendian in
+-  yes)
+ 
+-cat >>confdefs.h <<\_ACEOF
++echo "$ac_t""$ac_cv_c_bigendian" 1>&6
++if test $ac_cv_c_bigendian = yes; then
++  cat >> confdefs.h <<\EOF
+ #define WORDS_BIGENDIAN 1
+-_ACEOF
+- ;;
+-  no)
+-     ;;
+-  *)
+-    { { echo "$as_me:$LINENO: error: unknown endianness
+-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-echo "$as_me: error: unknown endianness
+-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
++EOF
+ 
++fi
+ 
++
+ if test "x$GCC" = "xyes"; then
+ 	CFLAGS="$CFLAGS -Wall"
+ fi
+@@ -2697,14 +1096,13 @@
+   case "${enableval}" in
+                  yes) shared=true ;;
+                  no) shared=false ;;
+-                 *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for shared options" >&5
+-echo "$as_me: error: bad value ${enableval} for shared options" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++                 *) { echo "configure: error: bad value ${enableval} for shared options" 1>&2; exit 1; } ;;
+                  esac
+ else
+   shared=false
+-fi;
++fi
+ 
++
+ case "$target_cpu" in
+      i386|i486|i586|i686)
+ 	TARGET_CPU=i386
+@@ -2712,7 +1110,7 @@
+      *)
+         TARGET_CPU=$target_cpu
+      ;;
+-esac
++esac     
+ TARGET_OS=$target_os
+ 
+ M68KCC=
+@@ -2726,7 +1124,7 @@
+ 		M68KCC=/usr/m68k-palmos/bin/gcc
+ 		# Generic build is ARM or M68K (probably ARM though)
+                 CC="/usr/$TARGET_CPU-palmos/bin/gcc"
+-		if test "$target_cpu" = "arm"
++		if test "$target_cpu" = "arm" 
+                 then
+                    CC="$CC -fPIC -march=armv4t"
+                 fi
+@@ -2762,7 +1160,7 @@
+      *)
+         HOST_CPU=$host_cpu
+      ;;
+-esac
++esac     
+ HOST_OS=$host_os
+ 
+ 
+@@ -2800,138 +1198,91 @@
+   case "${enableval}" in
+                  yes) sockets=true ;;
+                  no) sockets=false ;;
+-                 *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for sockets options" >&5
+-echo "$as_me: error: bad value ${enableval} for sockets options" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++                 *) { echo "configure: error: bad value ${enableval} for sockets options" 1>&2; exit 1; } ;;
+                  esac
+ else
+   sockets=true
+-fi;
++fi
++
+ if test "$sockets" = false; then
+-   cat >>confdefs.h <<\_ACEOF
++   cat >> confdefs.h <<\EOF
+ #define CST_NO_SOCKETS 1
+-_ACEOF
++EOF
+ 
+ fi
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++cat > conftest.$ac_ext <<EOF
++#line 1216 "configure"
++#include "confdefs.h"
+ #include <stdio.h>
+-int
+-main ()
+-{
++int main() {
+  struct a { union { float b; int c; } d; };
+-                 const struct a e = { .d={ .b=3.14 } };
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++                 const struct a e = { .d={ .b=3.14 } }; 
++; return 0; }
++EOF
++if { (eval echo configure:1224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
+   unioninit=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-unioninit=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  unioninit=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest*
+ if test "$unioninit" = no; then
+-   cat >>confdefs.h <<\_ACEOF
++   cat >> confdefs.h <<\EOF
+ #define NO_UNION_INITIALIZATION 1
+-_ACEOF
++EOF
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for mmap" >&5
+-echo $ECHO_N "checking for mmap... $ECHO_C" >&6
+-if test "${ac_cv_func_mmap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++echo $ac_n "checking for mmap""... $ac_c" 1>&6
++echo "configure:1242: checking for mmap" >&5
++if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++  cat > conftest.$ac_ext <<EOF
++#line 1247 "configure"
++#include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char mmap (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++    which can conflict with char mmap(); below.  */
++#include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+ /* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char mmap ();
++    builtin and then its argument prototype would still apply.  */
++char mmap();
++
++int main() {
++
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_mmap) || defined (__stub___mmap)
+ choke me
+ #else
+-char (*f) () = mmap;
++mmap();
+ #endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
+-int
+-main ()
+-{
+-return f != mmap;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_mmap=yes
++; return 0; }
++EOF
++if { (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_mmap=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_mmap=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_mmap=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest*
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_mmap" >&5
+-echo "${ECHO_T}$ac_cv_func_mmap" >&6
+-if test $ac_cv_func_mmap = yes; then
++
++if eval "test \"`echo '$ac_cv_func_'mmap`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   MMAPTYPE=posix
++else
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+@@ -2956,1028 +1307,266 @@
+ 
+ 
+ AUDIODRIVER=none
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:1312: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-      # Double quotes because CPP needs to be expanded
+-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+-    do
+-      ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
++    # This must be in double quotes, not single quotes, because CPP may get
++  # substituted into the Makefile and "${CC-cc}" will confuse make.
++  CPP="${CC-cc} -E"
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-                     Syntax error
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  # not just through cpp.
++  cat > conftest.$ac_ext <<EOF
++#line 1327 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether non-existent headers
+-  # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  # Broken: success on invalid input.
+-continue
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  break
+-fi
+-
+-    done
+-    ac_cv_prog_CPP=$CPP
+-
+-fi
+-  CPP=$ac_cv_prog_CPP
+-else
+-  ac_cv_prog_CPP=$CPP
+-fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
+-ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-                     Syntax error
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -E -traditional-cpp"
++  cat > conftest.$ac_ext <<EOF
++#line 1344 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether non-existent headers
+-  # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  # Broken: success on invalid input.
+-continue
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1361 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
+   :
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP=/lib/cpp
+ fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi
++rm -f conftest*
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+-
+-
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_header_stdc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_header_stdc=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <string.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
+-else
+-  ac_cv_header_stdc=no
+-fi
+ rm -f conftest*
+-
+ fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
+-else
+-  ac_cv_header_stdc=no
+-fi
+ rm -f conftest*
+-
++  ac_cv_prog_CPP="$CPP"
+ fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then
+-  :
++  CPP="$ac_cv_prog_CPP"
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <ctype.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+-                   (('a' <= (c) && (c) <= 'i') \
+-                     || ('j' <= (c) && (c) <= 'r') \
+-                     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
+-
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-        || toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_header_stdc=no
++  ac_cv_prog_CPP="$CPP"
+ fi
+-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+-if test $ac_cv_header_stdc = yes; then
++echo "$ac_t""$CPP" 1>&6
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
+-
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-                  inttypes.h stdint.h unistd.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_safe=`echo "sys/soundcard.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for sys/soundcard.h""... $ac_c" 1>&6
++echo "configure:1393: checking for sys/soundcard.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_Header=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Header=no"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
+-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5
+-echo $ECHO_N "checking sys/soundcard.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
++  cat > conftest.$ac_ext <<EOF
++#line 1398 "configure"
++#include "confdefs.h"
+ #include <sys/soundcard.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5
+-echo $ECHO_N "checking sys/soundcard.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/soundcard.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
++rm -f conftest*
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
+-echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sys_soundcard_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6
+-
+-fi
+-if test $ac_cv_header_sys_soundcard_h = yes; then
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   AUDIODRIVER="oss"
+                AUDIODEFS=-DCST_AUDIO_LINUX
++else
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-
+-if test "${ac_cv_header_machine_soundcard_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5
+-echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6
+-if test "${ac_cv_header_machine_soundcard_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5
+-echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6
++ac_safe=`echo "machine/soundcard.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for machine/soundcard.h""... $ac_c" 1>&6
++echo "configure:1427: checking for machine/soundcard.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking machine/soundcard.h usability" >&5
+-echo $ECHO_N "checking machine/soundcard.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
++  cat > conftest.$ac_ext <<EOF
++#line 1432 "configure"
++#include "confdefs.h"
+ #include <machine/soundcard.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking machine/soundcard.h presence" >&5
+-echo $ECHO_N "checking machine/soundcard.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <machine/soundcard.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
++rm -f conftest*
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: machine/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: machine/soundcard.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: machine/soundcard.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: machine/soundcard.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for machine/soundcard.h" >&5
+-echo $ECHO_N "checking for machine/soundcard.h... $ECHO_C" >&6
+-if test "${ac_cv_header_machine_soundcard_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_machine_soundcard_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_machine_soundcard_h" >&5
+-echo "${ECHO_T}$ac_cv_header_machine_soundcard_h" >&6
+-
+-fi
+-if test $ac_cv_header_machine_soundcard_h = yes; then
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   AUDIODRIVER="oss"
+                AUDIODEFS=-DCST_AUDIO_FREEBSD
++else
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-
+-if test "${ac_cv_header_sys_audioio_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/audioio.h" >&5
+-echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_audioio_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6
++ac_safe=`echo "sys/audioio.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for sys/audioio.h""... $ac_c" 1>&6
++echo "configure:1461: checking for sys/audioio.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/audioio.h usability" >&5
+-echo $ECHO_N "checking sys/audioio.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
++  cat > conftest.$ac_ext <<EOF
++#line 1466 "configure"
++#include "confdefs.h"
+ #include <sys/audioio.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sys/audioio.h presence" >&5
+-echo $ECHO_N "checking sys/audioio.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/audioio.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
++rm -f conftest*
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sys/audioio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: sys/audioio.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sys/audioio.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sys/audioio.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/audioio.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sys/audioio.h" >&5
+-echo $ECHO_N "checking for sys/audioio.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_audioio_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sys_audioio_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_audioio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_audioio_h" >&6
+-
+-fi
+-if test $ac_cv_header_sys_audioio_h = yes; then
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   AUDIODRIVER="sun"
+                AUDIODEFS=-DCST_AUDIO_SUNOS
++else
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+-
+-if test "${ac_cv_header_mmsystem_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for mmsystem.h" >&5
+-echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6
+-if test "${ac_cv_header_mmsystem_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5
+-echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6
++ ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
++echo "configure:1495: checking for alsa/asoundlib.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking mmsystem.h usability" >&5
+-echo $ECHO_N "checking mmsystem.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <mmsystem.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
++  cat > conftest.$ac_ext <<EOF
++#line 1500 "configure"
++#include "confdefs.h"
++#include <alsa/asoundlib.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking mmsystem.h presence" >&5
+-echo $ECHO_N "checking mmsystem.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <mmsystem.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
++rm -f conftest*
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  AUDIODRIVER="alsa"
++	       AUDIODEFS=-DCST_AUDIO_ALSA
++               AUDIOLIBS=-lasound
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
++  echo "$ac_t""no" 1>&6
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: mmsystem.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: mmsystem.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: mmsystem.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: mmsystem.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: mmsystem.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: mmsystem.h: proceeding with the preprocessor's result" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf@gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for mmsystem.h" >&5
+-echo $ECHO_N "checking for mmsystem.h... $ECHO_C" >&6
+-if test "${ac_cv_header_mmsystem_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_safe=`echo "mmsystem.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for mmsystem.h""... $ac_c" 1>&6
++echo "configure:1530: checking for mmsystem.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  ac_cv_header_mmsystem_h=$ac_header_preproc
++  cat > conftest.$ac_ext <<EOF
++#line 1535 "configure"
++#include "confdefs.h"
++#include <mmsystem.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_mmsystem_h" >&5
+-echo "${ECHO_T}$ac_cv_header_mmsystem_h" >&6
+-
++rm -f conftest*
+ fi
+-if test $ac_cv_header_mmsystem_h = yes; then
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   AUDIODRIVER="wince"
+ 	       AUDIODEFS=-DCST_AUDIO_WINCE
+ 	       AUDIOLIBS=-lwinmm
++else
++  echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+-
+-
+ # Check whether --with-audio or --without-audio was given.
+ if test "${with_audio+set}" = set; then
+   withval="$with_audio"
+-  AUDIODRIVER=$with_audio
+-fi;
++  AUDIODRIVER=$with_audio 
++fi
+ 
++
+ if test "x$AUDIODEFS" = x; then
+     case "$AUDIODRIVER" in
+ 	linux|oss)
+@@ -4006,34 +1595,34 @@
+ 
+ 
+ 
+-
+ # Check whether --with-lang or --without-lang was given.
+ if test "${with_lang+set}" = set; then
+   withval="$with_lang"
+-  FL_LANG=$with_lang
+-fi;
++  FL_LANG=$with_lang 
++fi
++
+ if test "x$with_lang" = "x"; then
+         FL_LANG="usenglish"
+ fi
+ 
+ 
+-
+ # Check whether --with-vox or --without-vox was given.
+ if test "${with_vox+set}" = set; then
+   withval="$with_vox"
+-  FL_VOX=$with_vox
+-fi;
++  FL_VOX=$with_vox 
++fi
++
+ if test "x$with_vox" = "x"; then
+         FL_VOX="cmu_us_kal"
+ fi
+ 
+ 
+-
+ # Check whether --with-lex or --without-lex was given.
+ if test "${with_lex+set}" = set; then
+   withval="$with_lex"
+-  FL_LEX=$with_lex
+-fi;
++  FL_LEX=$with_lex 
++fi
++
+ if test "x$with_lex" = "x"; then
+         FL_LEX="cmulex"
+ fi
+@@ -4041,921 +1630,300 @@
+ 
+ 
+ 
+-                    ac_config_files="$ac_config_files config/config config/system.mak"
+-cat >confcache <<\_ACEOF
++trap '' 1 2 15
++cat > confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
+ #
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
+ #
+-# `ac_cv_env_foo' variables (set or unset) will be overridden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
+-
+-_ACEOF
+-
++EOF
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+ # So, don't put newlines in cache variables' values.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-        "s/'/'\\\\''/g;
+-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
+   if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
+   else
+     echo "not updating unwritable cache $cache_file"
+   fi
+ fi
+ rm -f confcache
+ 
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
++# Any assignment to VPATH causes Sun make to only execute
++# the first set of double-colon rules, so remove it if not needed.
++# If there is a colon in the path, we need to keep it.
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ 	]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[ 	]*$//;
+-}'
++  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+ fi
+ 
++trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
++
+ # Transform confdefs.h into DEFS.
+ # Protect against shell expansion while executing Makefile rules.
+ # Protect against Makefile macro expansion.
+-#
+-# If the first sed substitution is executed (which looks for macros that
+-# take arguments), then we branch to the quote section.  Otherwise,
+-# look for a macro that doesn't take arguments.
+-cat >confdef2opt.sed <<\_ACEOF
+-t clear
+-: clear
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+-t quote
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+-t quote
+-d
+-: quote
+-s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+-s,\[,\\&,g
+-s,\],\\&,g
+-s,\$,$$,g
+-p
+-_ACEOF
+-# We use echo to avoid assuming a particular line-breaking character.
+-# The extra dot is to prevent the shell from consuming trailing
+-# line-breaks from the sub-command output.  A line-break within
+-# single-quotes doesn't work because, if this script is created in a
+-# platform that uses two characters for line-breaks (e.g., DOS), tr
+-# would break.
+-ac_LF_and_DOT=`echo; echo .`
+-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+-rm -f confdef2opt.sed
++cat > conftest.defs <<\EOF
++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
++s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
++s%\[%\\&%g
++s%\]%\\&%g
++s%\$%$$%g
++EOF
++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
++rm -f conftest.defs
+ 
+ 
+-ac_libobjs=
+-ac_ltlibobjs=
+-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+-  # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+-done
+-LIBOBJS=$ac_libobjs
+-
+-LTLIBOBJS=$ac_ltlibobjs
+-
+-
+-
++# Without the "./", some shells look in PATH for config.status.
+ : ${CONFIG_STATUS=./config.status}
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF
+-#! $SHELL
+-# Generated by $as_me.
++
++echo creating $CONFIG_STATUS
++rm -f $CONFIG_STATUS
++cat > $CONFIG_STATUS <<EOF
++#! /bin/sh
++# Generated automatically by configure.
+ # Run this file to recreate the current configuration.
++# This directory was configured as follows,
++# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++#
++# $0 $ac_configure_args
++#
+ # Compiler output produced by configure, useful for debugging
+-# configure, is in config.log if it exists.
++# configure, is in ./config.log if it exists.
+ 
+-debug=false
+-ac_cs_recheck=false
+-ac_cs_silent=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
+-
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
+-fi
+-
+-# Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
+-
+-
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
++ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
++for ac_option
+ do
+-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    $as_unset $as_var
+-  fi
++  case "\$ac_option" in
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
++    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
++  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
++    exit 0 ;;
++  -help | --help | --hel | --he | --h)
++    echo "\$ac_cs_usage"; exit 0 ;;
++  *) echo "\$ac_cs_usage"; exit 1 ;;
++  esac
+ done
+ 
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
++ac_given_srcdir=$srcdir
++ac_given_INSTALL="$INSTALL"
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+-  as_basename=basename
+-else
+-  as_basename=false
+-fi
++trap 'rm -fr `echo "config/config config/system.mak" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++EOF
++cat >> $CONFIG_STATUS <<EOF
+ 
++# Protect against being on the right side of a sed subst in config.status.
++sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
++ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
++$ac_vpsub
++$extrasub
++s%@SHELL@%$SHELL%g
++s%@CFLAGS@%$CFLAGS%g
++s%@CPPFLAGS@%$CPPFLAGS%g
++s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
++s%@DEFS@%$DEFS%g
++s%@LDFLAGS@%$LDFLAGS%g
++s%@LIBS@%$LIBS%g
++s%@exec_prefix@%$exec_prefix%g
++s%@prefix@%$prefix%g
++s%@program_transform_name@%$program_transform_name%g
++s%@bindir@%$bindir%g
++s%@sbindir@%$sbindir%g
++s%@libexecdir@%$libexecdir%g
++s%@datadir@%$datadir%g
++s%@sysconfdir@%$sysconfdir%g
++s%@sharedstatedir@%$sharedstatedir%g
++s%@localstatedir@%$localstatedir%g
++s%@libdir@%$libdir%g
++s%@includedir@%$includedir%g
++s%@oldincludedir@%$oldincludedir%g
++s%@infodir@%$infodir%g
++s%@mandir@%$mandir%g
++s%@host@%$host%g
++s%@host_alias@%$host_alias%g
++s%@host_cpu@%$host_cpu%g
++s%@host_vendor@%$host_vendor%g
++s%@host_os@%$host_os%g
++s%@target@%$target%g
++s%@target_alias@%$target_alias%g
++s%@target_cpu@%$target_cpu%g
++s%@target_vendor@%$target_vendor%g
++s%@target_os@%$target_os%g
++s%@build@%$build%g
++s%@build_alias@%$build_alias%g
++s%@build_cpu@%$build_cpu%g
++s%@build_vendor@%$build_vendor%g
++s%@build_os@%$build_os%g
++s%@CC@%$CC%g
++s%@RANLIB@%$RANLIB%g
++s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
++s%@INSTALL_DATA@%$INSTALL_DATA%g
++s%@AR@%$AR%g
++s%@TARGET_OS@%$TARGET_OS%g
++s%@TARGET_CPU@%$TARGET_CPU%g
++s%@M68KCC@%$M68KCC%g
++s%@LEXDEFS@%$LEXDEFS%g
++s%@VOXDEFS@%$VOXDEFS%g
++s%@HOST_OS@%$HOST_OS%g
++s%@HOST_CPU@%$HOST_CPU%g
++s%@OTHERLIBS@%$OTHERLIBS%g
++s%@SHFLAGS@%$SHFLAGS%g
++s%@MMAPTYPE@%$MMAPTYPE%g
++s%@STDIOTYPE@%$STDIOTYPE%g
++s%@CPP@%$CPP%g
++s%@AUDIODRIVER@%$AUDIODRIVER%g
++s%@AUDIODEFS@%$AUDIODEFS%g
++s%@AUDIOLIBS@%$AUDIOLIBS%g
++s%@FL_LANG@%$FL_LANG%g
++s%@FL_VOX@%$FL_VOX%g
++s%@FL_LEX@%$FL_LEX%g
++s%@EXEEXT@%$EXEEXT%g
+ 
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++CEOF
++EOF
+ 
++cat >> $CONFIG_STATUS <<\EOF
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++  if test $ac_beg -gt 1; then
++    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+   else
+-    PATH_SEPARATOR=:
++    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+   fi
+-  rm -f conf$$.sh
+-fi
+-
+-
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+-
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
+-
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
+-    sed '
+-      N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+-      t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
+-    ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
+-  # Exit status is that of the last command.
+-  exit
+-}
+-
+-
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
+-
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
++  if test ! -s conftest.s$ac_file; then
++    ac_more_lines=false
++    rm -f conftest.s$ac_file
+   else
+-    as_ln_s='ln -s'
++    if test -z "$ac_sed_cmds"; then
++      ac_sed_cmds="sed -f conftest.s$ac_file"
++    else
++      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
++    fi
++    ac_file=`expr $ac_file + 1`
++    ac_beg=$ac_end
++    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+-else
+-  as_ln_s='cp -p'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.file
+-
+-if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
+-else
+-  as_mkdir_p=false
+-fi
+-
+-as_executable_p="test -f"
+-
+-# Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+-
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+-
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+-exec 6>&1
+-
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+-# report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
+-This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.57.  Invocation command line was
+-
+-  CONFIG_FILES    = $CONFIG_FILES
+-  CONFIG_HEADERS  = $CONFIG_HEADERS
+-  CONFIG_LINKS    = $CONFIG_LINKS
+-  CONFIG_COMMANDS = $CONFIG_COMMANDS
+-  $ $0 $@
+-
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
+-_ACEOF
+-
+-# Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-ac_cs_usage="\
+-\`$as_me' instantiates files from templates according to the
+-current configuration.
+-
+-Usage: $0 [OPTIONS] [FILE]...
+-
+-  -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
+-  -q, --quiet      do not print progress messages
+-  -d, --debug      don't remove temporary files
+-      --recheck    update $as_me by reconfiguring in the same conditions
+-  --file=FILE[:TEMPLATE]
+-                   instantiate the configuration file FILE
+-
+-Configuration files:
+-$config_files
+-
+-Report bugs to <bug-autoconf@gnu.org>."
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-ac_cs_version="\\
+-config.status
+-configured by $0, generated by GNU Autoconf 2.57,
+-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+-
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+-Free Software Foundation, Inc.
+-This config.status script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-# If no file are specified by the user, then we need to provide default
+-# value.  By we need to know if files were specified by the user.
+-ac_need_defaults=:
+-while test $# != 0
+-do
+-  case $1 in
+-  --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+-    ac_shift=:
+-    ;;
+-  -*)
+-    ac_option=$1
+-    ac_optarg=$2
+-    ac_shift=shift
+-    ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
+-  esac
+-
+-  case $ac_option in
+-  # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
+-    debug=: ;;
+-  --file | --fil | --fi | --f )
+-    $ac_shift
+-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+-    ac_need_defaults=false;;
+-  --header | --heade | --head | --hea )
+-    $ac_shift
+-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+-    ac_need_defaults=false;;
+-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+-    ac_cs_silent=: ;;
+-
+-  # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-
+-  *) ac_config_targets="$ac_config_targets $1" ;;
+-
+-  esac
+-  shift
+ done
+-
+-ac_configure_extra_args=
+-
+-if $ac_cs_silent; then
+-  exec 6>/dev/null
+-  ac_configure_extra_args="$ac_configure_extra_args --silent"
++if test -z "$ac_sed_cmds"; then
++  ac_sed_cmds=cat
+ fi
++EOF
+ 
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+-fi
++cat >> $CONFIG_STATUS <<EOF
+ 
+-_ACEOF
+-
+-
+-
+-
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_config_target in $ac_config_targets
+-do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "config/config" ) CONFIG_FILES="$CONFIG_FILES config/config" ;;
+-  "config/system.mak" ) CONFIG_FILES="$CONFIG_FILES config/system.mak" ;;
+-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+-   { (exit 1); exit 1; }; };;
++CONFIG_FILES=\${CONFIG_FILES-"config/config config/system.mak"}
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
+   esac
+-done
+ 
+-# If the user did not use the arguments to specify the items to instantiate,
+-# then the envvar interface is used.  Set only those that are not.
+-# We use the long form for the default assignment because of an extremely
+-# bizarre bug on SunOS 4.1.3.
+-if $ac_need_defaults; then
+-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+-fi
++  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+ 
+-# Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
+-# creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
+-$debug ||
+-{
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+-}
+-
+-# Create a (secure) tmp directory for tmp files.
+-
+-{
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
+-}  ||
+-{
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
+-} ||
+-{
+-   echo "$me: cannot create a temporary directory in ." >&2
+-   { (exit 1); exit 1; }
+-}
+-
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+-#
+-# CONFIG_FILES section.
+-#
+-
+-# No need to generate the scripts if there are no CONFIG_FILES.
+-# This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s,@SHELL@,$SHELL,;t t
+-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s,@exec_prefix@,$exec_prefix,;t t
+-s,@prefix@,$prefix,;t t
+-s,@program_transform_name@,$program_transform_name,;t t
+-s,@bindir@,$bindir,;t t
+-s,@sbindir@,$sbindir,;t t
+-s,@libexecdir@,$libexecdir,;t t
+-s,@datadir@,$datadir,;t t
+-s,@sysconfdir@,$sysconfdir,;t t
+-s,@sharedstatedir@,$sharedstatedir,;t t
+-s,@localstatedir@,$localstatedir,;t t
+-s,@libdir@,$libdir,;t t
+-s,@includedir@,$includedir,;t t
+-s,@oldincludedir@,$oldincludedir,;t t
+-s,@infodir@,$infodir,;t t
+-s,@mandir@,$mandir,;t t
+-s,@build_alias@,$build_alias,;t t
+-s,@host_alias@,$host_alias,;t t
+-s,@target_alias@,$target_alias,;t t
+-s,@DEFS@,$DEFS,;t t
+-s,@ECHO_C@,$ECHO_C,;t t
+-s,@ECHO_N@,$ECHO_N,;t t
+-s,@ECHO_T@,$ECHO_T,;t t
+-s,@LIBS@,$LIBS,;t t
+-s,@build@,$build,;t t
+-s,@build_cpu@,$build_cpu,;t t
+-s,@build_vendor@,$build_vendor,;t t
+-s,@build_os@,$build_os,;t t
+-s,@host@,$host,;t t
+-s,@host_cpu@,$host_cpu,;t t
+-s,@host_vendor@,$host_vendor,;t t
+-s,@host_os@,$host_os,;t t
+-s,@target@,$target,;t t
+-s,@target_cpu@,$target_cpu,;t t
+-s,@target_vendor@,$target_vendor,;t t
+-s,@target_os@,$target_os,;t t
+-s,@CC@,$CC,;t t
+-s,@CFLAGS@,$CFLAGS,;t t
+-s,@LDFLAGS@,$LDFLAGS,;t t
+-s,@CPPFLAGS@,$CPPFLAGS,;t t
+-s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+-s,@OBJEXT@,$OBJEXT,;t t
+-s,@RANLIB@,$RANLIB,;t t
+-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+-s,@AR@,$AR,;t t
+-s,@ac_ct_AR@,$ac_ct_AR,;t t
+-s,@TARGET_OS@,$TARGET_OS,;t t
+-s,@TARGET_CPU@,$TARGET_CPU,;t t
+-s,@M68KCC@,$M68KCC,;t t
+-s,@LEXDEFS@,$LEXDEFS,;t t
+-s,@VOXDEFS@,$VOXDEFS,;t t
+-s,@HOST_OS@,$HOST_OS,;t t
+-s,@HOST_CPU@,$HOST_CPU,;t t
+-s,@OTHERLIBS@,$OTHERLIBS,;t t
+-s,@SHFLAGS@,$SHFLAGS,;t t
+-s,@MMAPTYPE@,$MMAPTYPE,;t t
+-s,@STDIOTYPE@,$STDIOTYPE,;t t
+-s,@CPP@,$CPP,;t t
+-s,@EGREP@,$EGREP,;t t
+-s,@AUDIODRIVER@,$AUDIODRIVER,;t t
+-s,@AUDIODEFS@,$AUDIODEFS,;t t
+-s,@AUDIOLIBS@,$AUDIOLIBS,;t t
+-s,@FL_LANG@,$FL_LANG,;t t
+-s,@FL_VOX@,$FL_VOX,;t t
+-s,@FL_LEX@,$FL_LEX,;t t
+-s,@LIBOBJS@,$LIBOBJS,;t t
+-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++  # Remove last slash and all that follows it.  Not all systems have dirname.
++  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++    # The file is in a subdirectory.
++    test ! -d "$ac_dir" && mkdir "$ac_dir"
++    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
++    # A "../" for each directory in $ac_dir_suffix.
++    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
++  else
++    ac_dir_suffix= ac_dots=
+   fi
+-fi # test -n "$CONFIG_FILES"
+ 
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-        cat >$tmp/stdin
+-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++  case "$ac_given_srcdir" in
++  .)  srcdir=.
++      if test -z "$ac_dots"; then top_srcdir=.
++      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
++  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
++  *) # Relative path.
++    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
++    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$ac_file" : 'X\(//\)[^/]' \| \
+-         X"$ac_file" : 'X\(//\)$' \| \
+-         X"$ac_file" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$as_dir" : 'X\(//\)[^/]' \| \
+-         X"$as_dir" : 'X\(//\)$' \| \
+-         X"$as_dir" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
++  case "$ac_given_INSTALL" in
++  [/$]*) INSTALL="$ac_given_INSTALL" ;;
++  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++  esac
+ 
+-  ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+-
+-
+-  case $INSTALL in
+-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  echo creating "$ac_file"
++  rm -f "$ac_file"
++  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
++  case "$ac_file" in
++  *Makefile*) ac_comsub="1i\\
++# $configure_input" ;;
++  *) ac_comsub= ;;
+   esac
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-                                     sed 's,.*/,,'` by configure."
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  sed -e "$ac_comsub
++s%@configure_input@%$configure_input%g
++s%@srcdir@%$srcdir%g
++s%@top_srcdir@%$top_srcdir%g
++s%@INSTALL@%$INSTALL%g
++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
++fi; done
++rm -f conftest.s*
+ 
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-         # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-         echo $f;;
+-      *) # Relative
+-         if test -f "$f"; then
+-           # Build tree
+-           echo $f
+-         elif test -f "$srcdir/$f"; then
+-           # Source tree
+-           echo $srcdir/$f
+-         else
+-           # /dev/null tree
+-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-         fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-_ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  sed "$ac_vpsub
+-$extrasub
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-:t
+-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s,@configure_input@,$configure_input,;t t
+-s,@srcdir@,$ac_srcdir,;t t
+-s,@abs_srcdir@,$ac_abs_srcdir,;t t
+-s,@top_srcdir@,$ac_top_srcdir,;t t
+-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s,@builddir@,$ac_builddir,;t t
+-s,@abs_builddir@,$ac_abs_builddir,;t t
+-s,@top_builddir@,$ac_top_builddir,;t t
+-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s,@INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
++EOF
++cat >> $CONFIG_STATUS <<EOF
+ 
+-done
+-_ACEOF
++EOF
++cat >> $CONFIG_STATUS <<\EOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-{ (exit 0); exit 0; }
+-_ACEOF
++exit 0
++EOF
+ chmod +x $CONFIG_STATUS
+-ac_clean_files=$ac_clean_files_save
++rm -fr confdefs* $ac_clean_files
++test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ 
+-
+-# configure is writing to config.log, and then calls config.status.
+-# config.status does its own redirection, appending to config.log.
+-# Unfortunately, on DOS this fails, as config.log is still kept open
+-# by configure, so config.status won't be able to write to it; its
+-# output is simply discarded.  So we exec the FD to /dev/null,
+-# effectively closing config.log, so it can be properly (re)opened and
+-# appended to by config.status.  When coming back to configure, we
+-# need to make the FD available again.
+-if test "$no_create" != yes; then
+-  ac_cs_success=:
+-  ac_config_status_args=
+-  test "$silent" = yes &&
+-    ac_config_status_args="$ac_config_status_args --quiet"
+-  exec 5>/dev/null
+-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+-  exec 5>>config.log
+-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+-  # would make configure fail if this is the last instruction.
+-  $ac_cs_success || { (exit 1); exit 1; }
+-fi
+-
+Index: configure.in
+===================================================================
+--- flite-1.3-release/configure.in	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/configure.in	(.../release-1.2)	(revision 7)
+@@ -206,10 +206,10 @@
+ AC_CHECK_HEADER(sys/audioio.h,
+               [AUDIODRIVER="sun"
+                AUDIODEFS=-DCST_AUDIO_SUNOS])
+-dnl AC_CHECK_HEADER(sys/asoundlib.h,
+-dnl              [AUDIODRIVER="alsa"
+-dnl	       AUDIODEFS=-DCST_AUDIO_ALSA
+-dnl               AUDIOLIBS=-lasound])
++ AC_CHECK_HEADER(alsa/asoundlib.h,
++              [AUDIODRIVER="alsa"
++	       AUDIODEFS=-DCST_AUDIO_ALSA
++               AUDIOLIBS=-lasound])
+ AC_CHECK_HEADER(mmsystem.h,
+ 	      [AUDIODRIVER="wince"
+ 	       AUDIODEFS=-DCST_AUDIO_WINCE
+Index: src/hrg/Makefile
+===================================================================
+--- flite-1.3-release/src/hrg/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/hrg/Makefile	(.../release-1.2)	(revision 7)
+@@ -39,9 +39,14 @@
+ BUILD_DIRS = 
+ ALL_DIRS= 
+ H = 
++include $(TOP)/config/config
+ SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \
+        cst_rel_io.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/utils/Makefile
+===================================================================
+--- flite-1.3-release/src/utils/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/utils/Makefile	(.../release-1.2)	(revision 7)
+@@ -44,8 +44,13 @@
+        cst_tokenstream.c cst_val.c cst_features.c \
+        cst_endian.c cst_socket.c cst_val_const.c \
+        cst_val_user.c cst_args.c 
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \
++        $(STDIOTYPE:%=cst_file_%.os)
++else
+ OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \
+         $(STDIOTYPE:%=cst_file_%.o)
++endif
+ FILES = Makefile $(H) $(SRCS) \
+ 	cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \
+ 	cst_file_stdio.c cst_file_wince.c cst_file_palmos.c
+Index: src/audio/au_alsa.c
+===================================================================
+--- flite-1.3-release/src/audio/au_alsa.c	(.../flite-1.3-orig)	(revision 0)
++++ flite-1.3-release/src/audio/au_alsa.c	(.../release-1.2)	(revision 7)
+@@ -0,0 +1,311 @@
++/*************************************************************************/
++/*                                                                       */
++/*                  Language Technologies Institute                      */
++/*                     Carnegie Mellon University                        */
++/*                        Copyright (c) 2000                             */
++/*                        All Rights Reserved.                           */
++/*                                                                       */
++/*  Permission is hereby granted, free of charge, to use and distribute  */
++/*  this software and its documentation without restriction, including   */
++/*  without limitation the rights to use, copy, modify, merge, publish,  */
++/*  distribute, sublicense, and/or sell copies of this work, and to      */
++/*  permit persons to whom this work is furnished to do so, subject to   */
++/*  the following conditions:                                            */
++/*   1. The code must retain the above copyright notice, this list of    */
++/*      conditions and the following disclaimer.                         */
++/*   2. Any modifications must be clearly marked as such.                */
++/*   3. Original authors' names are not deleted.                         */
++/*   4. The authors' names are not used to endorse or promote products   */
++/*      derived from this software without specific prior written        */
++/*      permission.                                                      */
++/*                                                                       */
++/*  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         */
++/*  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      */
++/*  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   */
++/*  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      */
++/*  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    */
++/*  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   */
++/*  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          */
++/*  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       */
++/*  THIS SOFTWARE.                                                       */
++/*                                                                       */
++/*********************************************************************** */
++/*             Author:  Lukas Loehrer (                                  */
++/*               Date:  January 2005                                     */
++/*************************************************************************/
++/*                                                                       */
++/*  Native access to alsa audio devices on Linux                         */
++/*  Tested with libasound version 1.0.10                                 */
++/*************************************************************************/
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <assert.h>
++#include <errno.h>
++
++#include "cst_string.h"
++#include "cst_wave.h"
++#include "cst_audio.h"
++
++#include <alsa/asoundlib.h>
++
++
++/*static char *pcm_dev_name = "hw:0,0"; */
++static char *pcm_dev_name ="default";
++
++static inline void print_pcm_state(snd_pcm_t *handle, char *msg)
++{
++  fprintf(stderr, "PCM state at %s = %s\n", msg,
++		  snd_pcm_state_name(snd_pcm_state(handle)));
++}
++
++cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt)
++{
++  cst_audiodev *ad;
++  unsigned 	int real_rate;
++  int err;
++
++  /* alsa specific stuff */
++  snd_pcm_t *pcm_handle;          
++  snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
++  snd_pcm_hw_params_t *hwparams;
++  snd_pcm_format_t format;
++  snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED;
++
++  /* Allocate the snd_pcm_hw_params_t structure on the stack. */
++  snd_pcm_hw_params_alloca(&hwparams);
++
++  /* Open pcm device */
++  err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0);
++  if (err < 0) 
++  {
++	cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n",
++			   pcm_dev_name, snd_strerror(err));
++	return NULL;
++  }
++
++  /* Init hwparams with full configuration space */
++  err = snd_pcm_hw_params_any(pcm_handle, hwparams);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err));
++	return NULL;
++  }
++
++  /* Set access mode */
++  err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err));
++	return NULL;
++  }
++
++  /* Determine matching alsa sample format */
++  /* This could be implemented in a more */
++  /* flexible way (byte order conversion). */
++  switch (fmt)
++  {
++  case CST_AUDIO_LINEAR16:
++	if (CST_LITTLE_ENDIAN)
++	  format = SND_PCM_FORMAT_S16_LE;
++	else
++	  format = SND_PCM_FORMAT_S16_BE;
++	break;
++  case CST_AUDIO_LINEAR8:
++	format = SND_PCM_FORMAT_U8;
++	break;
++  case CST_AUDIO_MULAW:
++	format = SND_PCM_FORMAT_MU_LAW;
++	break;
++  default:
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to find suitable format.\n");
++	return NULL;
++	break;
++  }
++
++  /* Set samble format */
++  err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format);
++  if (err <0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err));
++	return NULL;
++  }
++
++  /* Set sample rate near the disired rate */
++  real_rate = sps;
++  err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0);
++  if (err < 0)   
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err));
++	return NULL;
++  }
++  /*FIXME:  This is probably too strict */
++  assert(sps == real_rate);
++
++  /* Set number of channels */
++  assert(channels >0);
++  err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err));
++	return NULL;
++  }
++
++  /* Commit hardware parameters */
++  err = snd_pcm_hw_params(pcm_handle, hwparams);
++  if (err < 0) 
++  {
++	snd_pcm_close(pcm_handle);
++	cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err));
++	return NULL;
++  }
++
++  /* Make sure the device is ready to accept data */
++  assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED);
++
++  /* Write hardware parameters to flite audio device data structure */
++  ad = cst_alloc(cst_audiodev, 1);
++  assert(ad != NULL);
++  ad->real_sps = ad->sps = sps;
++  ad->real_channels = ad->channels = channels;
++  ad->real_fmt = ad->fmt = fmt;
++  ad->platform_data = (void *) pcm_handle;
++
++  return ad;
++}
++
++int audio_close_alsa(cst_audiodev *ad)
++{
++  int result;
++  snd_pcm_t *pcm_handle;
++
++  if (ad == NULL)
++	return 0;
++
++  pcm_handle = (snd_pcm_t *) ad->platform_data;
++  result = snd_pcm_close(pcm_handle);
++  if (result < 0)
++  {
++	cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result));
++  }
++  cst_free(ad);
++  return result;
++}
++
++/* Returns zero if recovery was successful. */
++static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res)
++{
++  if (res == -EPIPE) /* xrun */
++  {
++	res = snd_pcm_prepare(pcm_handle);
++	if (res < 0) 
++	{
++	  /* Failed to recover from xrun */
++	  cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res));
++	  return res;
++	}
++  } 
++  else if (res == -ESTRPIPE) /* Suspend */
++  {
++	while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN) 
++	{
++	  snd_pcm_wait(pcm_handle, 1000);
++	}
++	if (res < 0) 
++	{
++	  res = snd_pcm_prepare(pcm_handle);
++	  if (res <0) 
++	  {
++		/* Resume failed */
++		cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res));
++		return res;
++	  }
++	}
++  } 
++  else if (res < 0) 
++  {
++	/* Unknown failure */
++	cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res));
++	return res;
++  }
++  return 0;
++}
++
++int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes)
++{
++  size_t frame_size;
++  ssize_t num_frames, res;
++  snd_pcm_t *pcm_handle;
++  char *buf = (char *) samples;
++
++  /* Determine frame size in bytes */
++  frame_size  = audio_bps(ad->real_fmt) * ad->real_channels;
++  /* Require that only complete frames are handed in */
++  assert((num_bytes % frame_size) == 0);
++  num_frames = num_bytes / frame_size;
++  pcm_handle = (snd_pcm_t *) ad->platform_data;
++
++  while (num_frames > 0) 
++  {
++	res = snd_pcm_writei(pcm_handle, buf, num_frames);
++	if (res != num_frames) 
++	{
++	  if (res == -EAGAIN || (res > 0 && res < num_frames)) 
++	  {
++		snd_pcm_wait(pcm_handle, 100);
++	  }
++	  else if (recover_from_error(pcm_handle, res) < 0) 
++	  {
++		return -1;
++	  }
++	}
++
++	if (res >0) 
++	{
++	  num_frames -= res;
++	  buf += res * frame_size;
++	}
++  }
++  return num_bytes;
++}
++
++int audio_flush_alsa(cst_audiodev *ad)
++{
++  int result;
++  result = snd_pcm_drain((snd_pcm_t *) ad->platform_data);
++  if (result < 0)
++  {
++	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
++  }
++	/* Prepare device for more data */
++  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
++if (result < 0)
++  {
++	cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
++  }
++  return result;
++}
++
++int audio_drain_alsa(cst_audiodev *ad)
++{
++  int result;
++  result = snd_pcm_drop((snd_pcm_t *) ad->platform_data);
++  if (result < 0)
++  {
++	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
++  }
++/* Prepare device for more data */
++  result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
++if (result < 0)
++  {
++	cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
++  }
++  return result;
++}
+Index: src/audio/Makefile
+===================================================================
+--- flite-1.3-release/src/audio/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/audio/Makefile	(.../release-1.2)	(revision 7)
+@@ -43,9 +43,13 @@
+ 
+ BASESRCS = auclient.c auserver.c audio.c 
+ SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c)
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \
+-	au_oss.c au_sun.c au_wince.c au_palmos.c
++	au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c
+ LIBNAME = flite
+ 
+ LOCAL_INCLUDES = -I. $(AUDIODEFS)
+Index: src/lexicon/Makefile
+===================================================================
+--- flite-1.3-release/src/lexicon/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/lexicon/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,8 +38,13 @@
+ DIRNAME=src/lexicon
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/synth/Makefile
+===================================================================
+--- flite-1.3-release/src/synth/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/synth/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,9 +38,14 @@
+ DIRNAME=src/synth
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \
+        flite.c 
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/speech/Makefile
+===================================================================
+--- flite-1.3-release/src/speech/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/speech/Makefile	(.../release-1.2)	(revision 7)
+@@ -39,9 +39,14 @@
+ BUILD_DIRS = 
+ ALL_DIRS= 
+ H = 
++include $(TOP)/config/config
+ SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \
+        cst_wave_utils.c cst_lpcres.c rateconv.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/wavesynth/Makefile
+===================================================================
+--- flite-1.3-release/src/wavesynth/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/wavesynth/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,9 +38,14 @@
+ DIRNAME=src/wavesynth
+ BUILD_DIRS = 
+ ALL_DIRS=
++include $(TOP)/config/config
+ SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \
+        cst_sigprFP.c cst_sts.c cst_reflpc.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ LIBNAME = flite
+ FILES = Makefile $(SRCS)
+ 
+Index: src/regex/Makefile
+===================================================================
+--- flite-1.3-release/src/regex/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/regex/Makefile	(.../release-1.2)	(revision 7)
+@@ -42,8 +42,13 @@
+ DIRNAME=src/regex
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ SRCS = cst_regex.c regexp.c regsub.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/stats/Makefile
+===================================================================
+--- flite-1.3-release/src/stats/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/stats/Makefile	(.../release-1.2)	(revision 7)
+@@ -39,8 +39,13 @@
+ BUILD_DIRS = 
+ ALL_DIRS= 
+ H = 
++include $(TOP)/config/config
+ SRCS = cst_cart.c cst_viterbi.c cst_ss.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+ 
+Index: config/common_make_rules
+===================================================================
+--- flite-1.3-release/config/common_make_rules	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/config/common_make_rules	(.../release-1.2)	(revision 7)
+@@ -73,12 +73,13 @@
+ ifdef SHFLAGS
+ SOOBJS = $(OBJS:.o=.os)
+ FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
+-ifdef LIBNAME
+-ALL += $(OBJDIR)/.build_so
++#ifdef LIBNAME
++#ALL += $(OBJDIR)/.build_so
++#endif
+ endif
+-endif
+ ifdef LIBNAME
+ ALL += $(OBJDIR)/.build_lib
++ALL += $(OBJDIR)/.build_so
+ endif
+ # Only do some directories when you are not cross compiling
+ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
+@@ -117,14 +118,17 @@
+ 	@ touch $(OBJDIR)/.build_so
+ 
+ # Used in the lib/ directory and in building new voices
+-$(OBJDIR)/%.so: %.shared.a
++#$(OBJDIR)/%.so: %.shared.a
++%.so: %.shared.a
+ 	@ echo making $@
+ 	@ rm -rf shared_os && mkdir shared_os
+ 	@ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} 
+ 	@ (cd shared_os && ar x ../$<)
+ 	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
+-	@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
+-	@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
++	#@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
++	#@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
++	@ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
++	@ ln -s $@.${PROJECT_SHLIB_VERSION} $@
+ 	@ rm -rf shared_os
+ 
+ $(OBJDIR)/.make_build_dirs:
+Index: lib/Makefile
+===================================================================
+--- flite-1.3-release/lib/Makefile	(.../flite-1.3-orig)	(revision 0)
++++ flite-1.3-release/lib/Makefile	(.../release-1.2)	(revision 7)
+@@ -0,0 +1,70 @@
++###########################################################################
++##                                                                       ##
++##                  Language Technologies Institute                      ##
++##                     Carnegie Mellon University                        ##
++##                        Copyright (c) 1999                             ##
++##                        All Rights Reserved.                           ##
++##                                                                       ##
++##  Permission is hereby granted, free of charge, to use and distribute  ##
++##  this software and its documentation without restriction, including   ##
++##  without limitation the rights to use, copy, modify, merge, publish,  ##
++##  distribute, sublicense, and/or sell copies of this work, and to      ##
++##  permit persons to whom this work is furnished to do so, subject to   ##
++##  the following conditions:                                            ##
++##   1. The code must retain the above copyright notice, this list of    ##
++##      conditions and the following disclaimer.                         ##
++##   2. Any modifications must be clearly marked as such.                ##
++##   3. Original authors' names are not deleted.                         ##
++##   4. The authors' names are not used to endorse or promote products   ##
++##      derived from this software without specific prior written        ##
++##      permission.                                                      ##
++##                                                                       ##
++##  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         ##
++##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
++##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
++##  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      ##
++##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
++##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
++##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
++##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
++##  THIS SOFTWARE.                                                       ##
++##                                                                       ##
++###########################################################################
++##                                                                       ##
++##    FLITE libraries                                                    ##
++##                                                                       ##
++###########################################################################
++TOP=..
++DIRNAME=lib
++BUILD_DIRS = 
++ALL_DIRS=
++FILES = Makefile
++LIBNAMES = flite flite_cmulex flite_usenglish \
++           flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
++
++STATICLIBS= $(LIBNAMES:%=lib%.a)
++SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
++#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
++SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
++VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
++                    $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
++ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
++
++ALL = shared_libs
++
++LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
++
++include $(TOP)/config/common_make_rules
++
++ifdef SHFLAGS
++shared_libs: $(SHAREDLIBS)
++else
++shared_libs: nothing
++endif
++
++install:
++	@ cp -vf $(LIBDIR)/* .
++	@ $(MAKE) shared_libs
++	@ echo ARLIBS: $(SHAREDARLIBS)
++	@ echo SHARLIBS: $(SHAREDLIBS)
++	@ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
diff --git a/packages/flite/flite.inc b/packages/flite/flite.inc
new file mode 100644
index 0000000000..59373ba60d
--- /dev/null
+++ b/packages/flite/flite.inc
@@ -0,0 +1,44 @@
+DESCRIPTION = "flite - the festival light speech synthesizer"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.speech.cs.cmu.edu/flite/"
+SECTION = "console/utils"
+LICENSE = "flite"
+DEPENDS = "alsa-oss"
+
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}/flite-${PV}-release"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-audio=alsa --enable-shared"
+
+PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16"
+
+FILES_${PN} = "${bindir}"
+
+FILES_lib${PN} ="${libdir}/libflite.so.* \
+                 ${libdir}/libflite_cmu_time_awb.so.* \
+		 ${libdir}/libflite_cmulex.so.* \
+		 ${libdir}/libflite_usenglish.so.*"
+
+FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*"
+
+FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*"
+
+LEAD_SONAME = "libflite.so"
+
+do_install() {
+        oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install
+}
+
+
+do_stage () {
+        install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/
+        oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR}
+        oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR}
+        oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR}
+        oe_libinstall -C lib -a -so libflite_usenglish ${STAGING_LIBDIR}
+        oe_libinstall -C lib -a -so libflite_cmu_us_kal ${STAGING_LIBDIR}
+        oe_libinstall -C lib -a -so libflite_cmu_us_kal16 ${STAGING_LIBDIR}
+}
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index 556cd2b47c..e5a165eb97 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -1,47 +1,8 @@
-DESCRIPTION = "flite - the festival light speech synthesizer"
-PRIORITY = "optional"
-HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
-SECTION = "console/utils"
-LICENSE = "flite"
-PR = "r2"
+require flite.inc
 
-PARALLEL_MAKE = ""
+PR = "r3"
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
-           file://configure-with-audio.patch;patch=1 \
-           file://fix-read-only-assignments.patch;patch=1"
-S = "${WORKDIR}/flite-${PV}-release"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-audio=oss --enable-shared"
-
-PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16"
-
-FILES_${PN} = "${bindir}"
-
-FILES_lib${PN} ="${libdir}/libflite.so.* \
-                 ${libdir}/libflite_cmu_time_awb.so.* \
-		 ${libdir}/libflite_cmulex.so.* \
-		 ${libdir}/libflite_usenglish.so.*"
-
-FILES_lib${PN}-vox8 = "${libdir}/libflite_cmu_us_kal.so.*"
-
-FILES_lib${PN}-vox16 = "${libdir}/libflite_cmu_us_kal16.so.*"
-
-LEAD_SONAME = "libflite.so"
-
-do_install() {
-        oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install
-}
-
-
-do_stage () {
-        install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/
-        oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR}
-        oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR}
-        oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR}
-        oe_libinstall -C lib -a -so libflite_usenglish ${STAGING_LIBDIR}
-        oe_libinstall -C lib -a -so libflite_cmu_us_kal ${STAGING_LIBDIR}
-        oe_libinstall -C lib -a -so libflite_cmu_us_kal16 ${STAGING_LIBDIR}
-}
+#          http://homepage.hispeed.ch/loehrer/downloads/flite-1.2-alsa_support-1.2.diff.bz2 \
+           file://flite-1.2-alsa_support-1.2.diff;patch=1"
+#          file://configure-with-audio.patch;patch=1 \
diff --git a/packages/flite/flite_1.3.bb b/packages/flite/flite_1.3.bb
new file mode 100644
index 0000000000..85154b2b36
--- /dev/null
+++ b/packages/flite/flite_1.3.bb
@@ -0,0 +1,8 @@
+require flite.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.gz \
+#          http://homepage.hispeed.ch/loehrer/downloads/flite-1.3-alsa_support-1.2.diff.bz2 \
+           file://flite-1.3-alsa_support-1.2.diff;patch=1"
+#          file://fix-read-only-assignments.patch;patch=1 \
diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb
index aad4eb3382..f709086846 100644
--- a/packages/flumotion/flumotion_0.4.1.bb
+++ b/packages/flumotion/flumotion_0.4.1.bb
@@ -1,13 +1,19 @@
 DESCRIPTION = "Fluendo Streaming Server"
 LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk2"
-RDEPENDS = " python-resource python-pprint python-threading  python-imaging python-xml python-curses python-compression python-fcntl  python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface  python-textutils python-core python-gst python-misc"
-RDEPENDS_${PN}-gui = "${PN} python-pygtk2 python-pycairo "
-PR = "r7"
+DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
+RDEPENDS = "python-resource python-pprint python-threading \
+            python-imaging python-xml python-curses \
+            python-compression python-fcntl python-pygobject \
+            python-pickle python-netclient python-datetime \
+            python-crypt python-twisted-core python-twisted-web \
+            python-lang python-zopeinterface  python-textutils \
+            python-gst python-misc"
+RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
+PR = "r9"
 
 SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
            file://python-path.patch;patch=1 \
-	   file://no-check-for-python-stuff.patch;patch=1"
+           file://no-check-for-python-stuff.patch;patch=1"
 
 inherit autotools distutils-base pkgconfig
 
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
index a84237f263..027a990200 100644
--- a/packages/fstests/fstests.bb
+++ b/packages/fstests/fstests.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
+
+DEPENDS = "gtk+"
 
 inherit autotools
 
diff --git a/packages/gcc/files/gcc4-mtune-compat.patch b/packages/gcc/files/gcc4-mtune-compat.patch
new file mode 100644
index 0000000000..0da2811d37
--- /dev/null
+++ b/packages/gcc/files/gcc4-mtune-compat.patch
@@ -0,0 +1,14 @@
+Patch for gcc3 to support gcc4-compatible (and consistent) values for -mtune= option.
+
+--- gcc-3.4.4/gcc/config/arm/arm.c.org	2007-12-15 23:58:35.000000000 +0200
++++ gcc-3.4.4/gcc/config/arm/arm.c	2007-12-16 00:20:39.000000000 +0200
+@@ -432,7 +432,9 @@
+   {"arm10tdmi",	                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED             | FL_ARCH5 },
+   {"arm1020t",	                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED             | FL_ARCH5 },
+   {"arm926ejs",                          FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
++  {"arm926ej-s",                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
+   {"arm1026ejs",                         FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
++  {"arm1026ej-s",                        FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB                          | FL_ARCH5 | FL_ARCH5E },
+   {"xscale",                             FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE },
+   {"iwmmxt",                             FL_MODE32 | FL_FAST_MULT | FL_ARCH4 | FL_THUMB | FL_LDSCHED | FL_STRONG | FL_ARCH5 | FL_ARCH5E | FL_XSCALE | FL_IWMMXT },
+   /* V6 Architecture Processors */
diff --git a/packages/gcc/gcc-cross-initial_4.2.1.bb b/packages/gcc/gcc-cross-initial_4.2.1.bb
index 0f8813cc70..fe326d304b 100644
--- a/packages/gcc/gcc-cross-initial_4.2.1.bb
+++ b/packages/gcc/gcc-cross-initial_4.2.1.bb
@@ -1,6 +1,5 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-EXTRA_OECONF += "  --disable-libgomp \
-                --disable-libmudflap \
+EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
 		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-initial_4.2.2.bb b/packages/gcc/gcc-cross-initial_4.2.2.bb
index 1c1d094382..fe326d304b 100644
--- a/packages/gcc/gcc-cross-initial_4.2.2.bb
+++ b/packages/gcc/gcc-cross-initial_4.2.2.bb
@@ -1,5 +1,5 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-EXTRA_OECONF += "--disable-libmudflap \
+EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
 		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index a8e9a67a96..038d39040b 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 require gcc_${PV}.bb
-PR = "r1"
+PR = "r2"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index a24752fe89..509fe59469 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,6 +1,7 @@
 SECTION = "devel"
 require gcc_${PV}.bb
 inherit cross
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 34e111ee45..7cee36d66c 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -4,7 +4,7 @@ require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-PR="r5"
+PR="r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 21ca6656ec..cec0505eda 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 0f0ad3b98f..83c0055017 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r5"
+PR = "r7"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 73fd86a720..63d0f70c74 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 33544af026..44ceb4f4ca 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index bfcfac2033..5719afb740 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index a817eb3a84..02912f2054 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r16"
+PR = "r17"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index cfb805a0ed..306cf9539c 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment this one too.
-PR = "r12"
+PR = "r13"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 8204e2c316..27816e7146 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -16,5 +16,8 @@ require gcc3-build-cross.inc
 require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+# Do not build libssp libmudflap and libgomp
+# We might need them for some beefy targets
+EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
+		--disable-libgomp --disable-libmudflap \
+		--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 1d5ebdcc61..ec169072af 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
@@ -14,7 +14,9 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 require gcc3-build-cross.inc
 # cross packaging
 require gcc-package-cross.inc
-
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+# Do not build libssp libmudflap and libgomp
+# We might need them for some beefy targets 
+EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
+		--disable-libgomp --disable-libmudflap \
+		--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 7ea8a0d166..b779e99435 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -4,7 +4,7 @@ require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index b894c2a86e..a9cb478701 100644
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -4,7 +4,7 @@ require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index 95bda6c95e..5ca4b949e0 100644
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -4,7 +4,7 @@ require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index bb48f7b099..e56dcdcc4d 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -39,9 +39,11 @@ EXTRA_OECONF_PATHS = " \
                       --with-local-prefix=${prefix}/local \
                       --with-gxx-include-dir=${includedir}/c++/${BINV}"
 
-EXTRA_OECONF_DEP = ""
-EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
-EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+# Build uclibc compilers without cxa_atexit support
+EXTRA_OECONF_append_linux               = " --enable-__cxa_atexit"
+EXTRA_OECONF_append_linux-gnueabi       = " --enable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibc        = " --disable-__cxa_atexit"
+EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit"
 EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
 CPPFLAGS = ""
 
@@ -56,19 +58,6 @@ EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
 
 require gcc-fpu.inc
 
-python __anonymous () {
-    import bb, re
-    if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
-    elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-           bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-    elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None):
-        bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
-
-}
-
 do_configure () {
 	# Setup these vars for cross building only
 	# ... because foo_FOR_TARGET apparently gets misinterpreted inside the
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index 07387cb1bc..ea34debc64 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index f11fc36646..294e57d7df 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index e1f73eaea5..c4d6df955d 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r12"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index adc1545b99..4694d3ac5e 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r7"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -23,7 +23,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
 	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
-	   file://zecke-xgcc-cpp.patch;patch=1 "
+	   file://zecke-xgcc-cpp.patch;patch=1 \
+	   file://gcc4-mtune-compat.patch;patch=1"
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 430bbef0d4..28561e1e07 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 1d7d8242fe..19d67ab1b4 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "mpfr gmp"
-PR = "r5"
+PR = "r6"
 
 inherit autotools gettext
 
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index bdf9eb3b69..a9dbad579f 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index d7d489ec9f..8d08df6b8c 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r16"
+PR = "r17"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index 939055ddfa..b3eb0100e8 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment the -cross .bb PR too.
-PR = "r9"
+PR = "r10"
 
 inherit autotools gettext
 
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index ccf945ac5b..de3b65ce7f 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index fe9b364c88..4c8f8227a9 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-2005q3"
-PR = "r2"
+PR = "r3"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb
index 20b18b1085..d8e5fee2bb 100644
--- a/packages/gcc/gcc_csl-arm-cvs.bb
+++ b/packages/gcc/gcc_csl-arm-cvs.bb
@@ -5,6 +5,6 @@ BINV = "3.4.4"
 
 SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb
index c332feb463..2599498fda 100644
--- a/packages/gcc/gcc_csl-arm.bb
+++ b/packages/gcc/gcc_csl-arm.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/git/git-native_1.5.3.bb b/packages/git/git-native_1.5.3.bb
new file mode 100644
index 0000000000..935c773c1c
--- /dev/null
+++ b/packages/git/git-native_1.5.3.bb
@@ -0,0 +1,4 @@
+require git.inc
+inherit native
+DEPENDS = "openssl-native curl-native zlib-native expat-native"
+PR = "r1"
diff --git a/packages/git/git.inc b/packages/git/git.inc
new file mode 100644
index 0000000000..7115d44b35
--- /dev/null
+++ b/packages/git/git.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "The git revision control system used by the Linux kernel developers"
+SECTION = "console/utils"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
+           file://autotools.patch;patch=1"
+S = "${WORKDIR}/git-${PV}"
+
+EXTRA_OEMAKE = "NO_TCLTL=1"
+
+inherit autotools
+
+do_install () {
+	oe_runmake install prefix=${D} bindir=${D}${bindir} \
+		template_dir=${D}${datadir}/git-core/templates \
+		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+}
+
+FILES_${PN} += "${datadir}/git-core"
diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass
index 0cb8497733..a859ac2ca9 100644
--- a/packages/glibc/eglibc-package.bbclass
+++ b/packages/glibc/eglibc-package.bbclass
@@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
-PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
 
 RPROVIDES_eglibc = "glibc"
 RPROVIDES_eglibc-utils = "glibc-utils"
@@ -210,6 +210,7 @@ python package_do_split_gconvs () {
 		f.close()
 		if deps != []:
 			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d)
 
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
@@ -261,6 +262,7 @@ python package_do_split_gconvs () {
 		else:
 			eglibc_name = name
 		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+		bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d)
 		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
 		m = re.match("(.*)_(.*)", name)
 		if m:
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index da33cca3fa..ff68185bcc 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -2,8 +2,8 @@ require glibc.inc
 
 DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
-PV = "2.6+svnr${SRCREV}"
-PR = "r1"
+PV = "2.7+svnr${SRCREV}"
+PR = "r2"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
diff --git a/packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch b/packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch
new file mode 100644
index 0000000000..138c5414cb
--- /dev/null
+++ b/packages/glibc/glibc-2.2.5/glibc-2.2.5-allow-gcc-4.x-configure.patch
@@ -0,0 +1,21 @@
+Fixes
+checking version of powerpc-405-linux-gnu-gcc ... 4.0.0, bad
+checking for gnumake... no
+checking for gmake... no
+checking for make... make
+checking version of make... 3.80, ok
+configure: error:
+*** These critical programs are missing or too old:gcc 
+
+
+--- glibc-2.2.5/configure.old	2005-03-10 00:23:46.374213600 -0800
++++ glibc-2.2.5/configure	2005-03-10 00:25:13.313996744 -0800
+@@ -1476,7 +1476,7 @@
+   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    *gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*)
++    *gcc-2.9[5-9].*|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|3.[0-9]*|4.[0-9]*|cygnus-2.9[1-9]*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9]|sgicc-*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 
diff --git a/packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch b/packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch
new file mode 100644
index 0000000000..bda01b4267
--- /dev/null
+++ b/packages/glibc/glibc-2.2.5/glibc-2.3.2-allow-solaris.patch
@@ -0,0 +1,41 @@
+See http://sources.redhat.com/ml/crossgcc/2003-11/msg00111.html
+Might fix error
+... gcc-3.2.3-glibc-2.3.2/build-glibc/csu/version-info.h:8: too many decimal points in floating constant
+make[2]: ***
+when building on Solaris.  I haven't seen this be needed yet, but what the heck,
+here it is in case someone needs it.
+
+Retrieved with http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/csu/Makefile.diff?r1=1.70&r2=1.71&cvsroot=glibc
+
+Revision 1.71, Thu Sep 25 20:29:39 2003 UTC (8 months, 2 weeks ago) by drepper
+Branch: MAIN
+CVS Tags: glibc-2_3_3
+
+($(objpfx)version-info.h): Fix sed script to handle banners.
+
+===================================================================
+RCS file: /cvs/glibc/libc/csu/Makefile,v
+retrieving revision 1.70
+retrieving revision 1.71
+diff -u -r1.70 -r1.71
+--- libc/csu/Makefile	2003/06/26 07:27:39	1.70
++++ libc/csu/Makefile	2003/09/25 20:29:39	1.71
+@@ -222,14 +222,14 @@
+ 		   if [ -z "$$os" ]; then \
+ 		     os=Linux; \
+ 		   fi; \
+-		   echo "\"Compiled on a $$os $$version system" \
+-			"on `date +%Y-%m-%d`.\\n\"" ;; \
++		   printf '"Compiled on a %s %s system on %s.\\n"\n' \
++			"$os" "$version" "`date +%Y-%m-%d`" ;; \
+ 	   *) ;; \
+ 	 esac; \
+ 	 files="$(all-Banner-files)";				\
+ 	 if test -n "$$files"; then				\
+-	   echo "\"Available extensions:\\n\"";			\
++	   printf '"Available extensions:\\n"\n';		\
+ 	   sed -e '/^#/d' -e 's/^[[:space:]]*/	/'		\
+-	       -e 's/\(^.*$$\)/\"\1\\n\"/' $$files;		\
++	       -e 's/^\(.*\)$$/\"\1\\n\"/' $$files;		\
+ 	 fi) > $@T
+ 	mv -f $@T $@
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 1f14bb83fb..b96aae37b9 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -220,10 +220,13 @@ python package_do_split_gconvs () {
 	dot_re = re.compile("(.*)\.(.*)")
 
 	# Collate the locales by base and encoding
+	utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0)
 	encodings = {}
 	for l in supported:
 		l = l[:-1]
 		(locale, charset) = l.split(" ")
+		if utf8_only and charset != 'UTF-8':
+			continue
 		m = dot_re.match(locale)
 		if m:
 			locale = m.group(1)
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 7b5eca2432..2a3bfd26df 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r13"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
@@ -63,6 +63,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \
 	   file://errlist-arm.patch;patch=1 \
 	   file://glibc-2.2.5-allow-gcc-3.4-fixup.patch;patch=1 \
 	   file://glibc-2.2.5-allow-gcc-3.4-grp.patch;patch=1 \
+	   file://glibc-2.2.5-allow-gcc-4.x-configure.patch;patch=1 \
 	   file://glibc-2.2.5-alpha-pwrite64.patch;patch=1 \
 	   file://glibc-2.2.5-arm-pwrite64.patch;patch=1 \
 	   file://glibc-2.2.5-crosstest.patch;patch=1 \
@@ -95,6 +96,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \
 	   file://threadparam.patch;patch=1 \
 	   file://initfini-flags.patch;patch=1 \
 	   file://pt-initfini-flags.patch;patch=1 \
+	   file://glibc-2.3.2-allow-solaris.patch;patch=1 \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
@@ -161,7 +163,7 @@ do_stage() {
 	rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
 	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
 		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
-		   '${STAGING_DIR_HOST}${layout_base_libdir}libc.so.6' \
+		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
 		   '${STAGING_INCDIR}/bits/errno.h' \
 		   '${STAGING_INCDIR}/bits/libc-lock.h' \
 		   '${STAGING_INCDIR}/gnu/stubs.h' \
@@ -199,6 +201,7 @@ require glibc-package.bbclass
 
 PACKAGES_unslung = "libc6-unslung"
 PACKAGE_ARCH_unslung = "nslu2"
+PACKAGE_NO_GCONV_unslung = "1"
 RDEPENDS_libc6-unslung = "nslu2-linksys-libs"
 RPROVIDES_libc6-unslung = "libc6"
 
diff --git a/packages/glibmm/glibmm.inc b/packages/glibmm/glibmm.inc
new file mode 100644
index 0000000000..c33d3151ae
--- /dev/null
+++ b/packages/glibmm/glibmm.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "C++ bindings for the glib library."
+HOMEPAGE = "http://www.gtkmm.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 libsigc++-2.0"
+PR = "r0"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2"
+
+inherit autotools pkgconfig flow-lossage
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
+
+LIBV = "2.4.0"
+
+do_stage () {
+	autotools_stage_all
+
+	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
+	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/glibmm/glibmm_2.12.10.bb b/packages/glibmm/glibmm_2.12.10.bb
index a62d4eb145..90a053fb36 100644
--- a/packages/glibmm/glibmm_2.12.10.bb
+++ b/packages/glibmm/glibmm_2.12.10.bb
@@ -1,23 +1 @@
-DESCRIPTION = "C++ bindings for the glib library."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 libsigc++-2.0"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-${PV}.tar.bz2"
-
-inherit autotools pkgconfig flow-lossage
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
-
-LIBV = "2.4.0"
-
-do_stage () {
-	autotools_stage_all
-
-	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
-	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
-}
+require glibmm.inc
diff --git a/packages/glibmm/glibmm_2.14.2.bb b/packages/glibmm/glibmm_2.14.2.bb
new file mode 100644
index 0000000000..aeadede939
--- /dev/null
+++ b/packages/glibmm/glibmm_2.14.2.bb
@@ -0,0 +1,3 @@
+require glibmm.inc
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index cc69079c3a..e7875dc72e 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
 	   file://69gconfd-dbus"
@@ -19,6 +19,7 @@ PARALLEL_MAKE = ""
 
 FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
 FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
 
 EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
 
diff --git a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty
+++ b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/armeb/art_config.h b/packages/gnome/libart-lgpl/armeb/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/armeb/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/packages/gpe-login/files/size-autolock-properly.patch b/packages/gpe-login/files/size-autolock-properly.patch
new file mode 100644
index 0000000000..b8e2cd6f4f
--- /dev/null
+++ b/packages/gpe-login/files/size-autolock-properly.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>"
+# Date 1196345352 -7200
+# Node ID ebe625e21708cb9257201a4dd6e536b99f1f0220
+# Parent  976c01632feacbcce2058a061a0b1f6faed2275a
+When configuring autolock window, make sure to set not only the minimal
+("requested") size, but also the actual one. This fixes issue that after
+autolock screen have been shown in landscape mode, it no longer fits the
+screen in portrait mode.
+
+Also, gtk_widget_set_usize() marked as deprecated, replace with
+gtk_widget_set_size_request().
+
+diff -r 976c01632fea -r ebe625e21708 gpe-login.c
+--- a/gpe-login.c	Sun Nov 25 22:39:23 2007 +0200
++++ b/gpe-login.c	Thu Nov 29 16:09:12 2007 +0200
+@@ -558,7 +558,8 @@ filter (GdkXEvent *xevp, GdkEvent *ev, g
+ 	{
+ 	  spawn_xkbd ();
+ 	  gtk_label_set_markup (GTK_LABEL (label_result), "");
+-	  gtk_widget_set_usize (window, gdk_screen_width (), gdk_screen_height ());
++	  gtk_widget_set_size_request (window, gdk_screen_width (), gdk_screen_height ());
++	  gtk_window_resize (window, gdk_screen_width (), gdk_screen_height ());
+ 	  gtk_widget_show_all (window);
+       if (ownerinfo)
+         {  
diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb
index c2a274ba8b..253d581953 100644
--- a/packages/gpe-login/gpe-login_0.90.bb
+++ b/packages/gpe-login/gpe-login_0.90.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r4"
+PR = "r5"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
@@ -18,6 +18,7 @@ SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
 SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
 SRC_URI += " file://lock-on-supend.patch;patch=1 "
 SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
+SRC_URI += " file://size-autolock-properly.patch;patch=1 "
 
 SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty b/packages/gpe-mini-browser/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty
+++ b/packages/gpe-mini-browser/files/.mtn2git_empty
diff --git a/packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch b/packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch
new file mode 100644
index 0000000000..4912abb23b
--- /dev/null
+++ b/packages/gpe-mini-browser/files/mini-browser-desktop-fix.patch
@@ -0,0 +1,16 @@
+--- gpe-mini-browser-0.21.old/gpe-mini-browser-0.21//gpe-mini-browser.desktop.in.in	2007-01-09 14:53:31.000000000 +0200
++++ gpe-mini-browser-0.21/gpe-mini-browser.desktop.in.in	2007-12-11 20:45:04.749584640 +0200
+@@ -2,9 +2,8 @@
+ _Name=Mini Web Browser
+ _Comment=Browse the web
+ Exec=gpe-mini-browser
+-Terminal=0
++Terminal=false
+ Type=Application
+-Icon=gpe-mini-browser.png
+-Categories=Application;PIM;GPE
+-StartupNotify=True
+-
++Icon=gpe-mini-browser
++Categories=X-GPE;X-PIM;X-Internet;X-Browser;
++StartupNotify=true
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
index 20732ea5b2..2a9249818b 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
@@ -4,7 +4,9 @@ SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.g
 DEPENDS = "osb-nrcit sqlite libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://mini-browser-desktop-fix.patch;patch=0"
 
 S = "${WORKDIR}/gpe-mini-browser-${PV}"
 
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
index 77f8289025..da61845f4d 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk-engines"
 RDEPENDS = "gtk-engine-clearlooks"
 
 FILES_${PN} = "${datadir}/themes/"
-SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
index 0ec4e10338..33712c70ee 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk-engines"
 RDEPENDS = "gtk-engine-clearlooks"
 
 FILES_${PN} = "${datadir}/themes/"
-SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
index 1a57e03d03..8a455de250 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
@@ -7,7 +7,7 @@ DEPENDS =		"gtk-engines"
 RDEPENDS =		"gtk-engine-industrial"
 
 FILES_${PN} =	"${datadir}/themes/"
-SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI =		"http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb
index 02b7a62c0d..c1cd5ca41d 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk-engines"
 RDEPENDS = "gtk-engine-industrial"
 
 FILES_${PN} = "${datadir}/themes/"
-SRC_URI = "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
+SRC_URI = "http://dominion.thruhere.net/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb
index 1efcd793e0..204f7828f9 100644
--- a/packages/gpephone/gpe-applauncher_0.11.bb
+++ b/packages/gpephone/gpe-applauncher_0.11.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r1"
+PR          = "r2"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
@@ -18,7 +18,7 @@ inherit gpephone autotools
 SRC_URI += "file://hotkeys.conf \
             file://softkeys.conf"
 
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} = '${datadir} ${bindir}'
 FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb
index 4fe82877e3..311d2eef60 100644
--- a/packages/gpephone/gpe-applauncher_svn.bb
+++ b/packages/gpephone/gpe-applauncher_svn.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
 PV          = "0.11+svn-${SRCREV}"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
@@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config"
 SRC_URI += "file://hotkeys.conf \
             file://softkeys.conf"
 
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} = '${datadir} ${bindir}'
 FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
diff --git a/packages/gsm/pty_0.0.bb b/packages/gsm/pty_0.0.bb
index 39592a90a1..ab767f7979 100644
--- a/packages/gsm/pty_0.0.bb
+++ b/packages/gsm/pty_0.0.bb
@@ -5,12 +5,11 @@ PR = "r1"
 SRC_URI = "file://pty.c"
 
 do_compile() {
-        cp ${WORKDIR}/*.c ${S}/
+	cp ${WORKDIR}/*.c ${S}/
 	${CC} pty.c -o pty -I${STAGING_INCDIR} -L${STAGING_LIBDIR}
 }
 
 do_install() {
-        install -d ${D}${bindir}
+	install -d ${D}${bindir}
 	install -m 0755 pty ${D}${bindir}/
 }
-
diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb
index 5b5482d1a8..ecd2d51d49 100644
--- a/packages/gtk+/gdk-pixbuf_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb
@@ -1,14 +1,14 @@
-DESCRIPTION = "GDK PixBuf is a pixelmap image support library from the GTK+ \
-multi-platform toolkit for creating graphical user interfaces."
+DESCRIPTION = "Stand-alone libpixbuf, a pixelmap image i/o library from the \
+GTK+ multi-platform toolkit for creating graphical user interfaces."
 HOMEPAGE = "http://www.gtk.org/"
 SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-DEPENDS = "jpeg libpng gettext glib-2.0"
+DEPENDS = "libpng gettext glib-2.0"
+PR = "r1"
 
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-PR = "r0"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://automake-lossage.patch;patch=1 \
@@ -35,12 +35,10 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
 #           file://treeview-checkbox-size.patch;patch=1;pnum=0 \
 #           file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
 
-# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require gtk-fpu.inc
-EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
-
 inherit autotools pkgconfig
 
+LIBV = "2.10.0"
+
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-update-icon-cache \
 	${libdir}/lib*.so.*"
@@ -59,11 +57,15 @@ EXTRA_OECONF = "\
   --without-x \
   --with-gdktarget=linux-fb \
   --without-libtiff \
-  --with-libjpeg \
+  --without-libjpeg \
   --with-libpng \
 "
 
-LIBV = "2.10.0"
+EXTRA_OECONF += "--disable-modules --with-included-loaders=png,tga"
+
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require gtk-fpu.inc
+EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
 
 do_compile() {
 	cd gdk-pixbuf && oe_runmake
@@ -82,22 +84,3 @@ do_install() {
 	cd gdk-pixbuf && oe_runmake install DESTDIR=${D}
 }
 
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
-}
diff --git a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch b/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
deleted file mode 100644
index 9560abf9ba..0000000000
--- a/packages/gtk+/gtk+-2.2.4/automake-lossage.patch
+++ /dev/null
@@ -1,446 +0,0 @@
---- gtk/Makefile.am.old	2003-09-03 20:50:06.000000000 +0100
-+++ gtk/Makefile.am	2004-03-07 12:17:29.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- SUBDIRS=stock-icons theme-bits
- 
--INCLUDES = @STRIP_BEGIN@ \
-+INCLUDES =  \
- 	-DG_LOG_DOMAIN=\"Gtk\"				\
- 	-DGTK_LIBDIR=\"$(libdir)\"			\
- 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
-@@ -20,8 +20,7 @@
- 	-DGDK_DISABLE_DEPRECATED			\
- 	-DGTK_DISABLE_DEPRECATED			\
- 	@GTK_DEBUG_FLAGS@				\
--	@GTK_DEP_CFLAGS@				\
--@STRIP_END@
-+	@GTK_DEP_CFLAGS@
- 
- gtarget=@gdktarget@
- 
-@@ -67,7 +66,7 @@
- # since automake doesn't support conditionalized libsomething_la_LDFLAGS
- # we use the general approach here
- libgtkincludedir = $(includedir)/gtk-2.0/gtk
--LDFLAGS = @STRIP_BEGIN@ \
-+AM_LDFLAGS =  \
- 	@LDFLAGS@								\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)			\
- 	-export-dynamic								\
-@@ -77,8 +76,8 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		\
- 	$(top_builddir)/gdk/@gdktargetlib@					\
- 	$(libgtk_target_ldflags)						\
--	@GTK_DEP_LIBS@								\
--@STRIP_END@
-+	@GTK_DEP_LIBS@
-+
- 
- #
- # setup source file variables
-@@ -86,7 +85,7 @@
- 
- # GTK+ header files for public installation (non-generated, or generated
- # by configure)
--gtk_public_h_sources = @STRIP_BEGIN@ \
-+gtk_public_h_sources =  \
- 	gtk.h			\
- 	gtkaccelgroup.h		\
- 	gtkaccellabel.h		\
-@@ -228,10 +227,10 @@
- 	gtkvscrollbar.h		\
- 	gtkvseparator.h		\
- 	gtkwidget.h		\
--	gtkwindow.h		\
--@STRIP_END@
-+	gtkwindow.h
-+
- # GTK+ header files that don't get installed
--gtk_private_h_sources = @STRIP_BEGIN@ \
-+gtk_private_h_sources =  \
- 	gtkrbtree.h 		\
- 	gtktextbtree.h		\
- 	gtktextchildprivate.h   \
-@@ -244,8 +243,7 @@
- 	gtkthemes.h		\
- 	gtktreedatalist.h	\
- 	gtktreeprivate.h	\
--	gtkwindow-decorate.h    \
--@STRIP_END@
-+	gtkwindow-decorate.h
- 
- # GTK+ C sources to build the library from
- 
-@@ -257,7 +255,7 @@
- 	gtktreeitem.c
- endif
- 
--gtk_c_sources = @STRIP_BEGIN@   \
-+gtk_c_sources =			\
- 	gtkaccelgroup.c		\
- 	gtkaccelmap.c		\
- 	gtkaccellabel.c		\
-@@ -410,15 +408,13 @@
- 	gtkwindow-decorate.c    \
- 	fnmatch.c		\
- 	xembed.h		\
--	${crufty_gtk_c_sources}	\
--@STRIP_END@
-+	${crufty_gtk_c_sources}
- 
--gtk_plug_c_sources = @STRIP_BEGIN@   \
-+gtk_plug_c_sources =		\
- 	gtkplug.c		\
- 	gtksocket.c		\
- 	gtkxembed.c		\
--	gtkxembed.h		\
--@STRIP_END@
-+	gtkxembed.h
- 
- # we use our own built_sources variable rules to avoid automake's
- # BUILT_SOURCES oddities
-@@ -427,35 +423,34 @@
- # content
- 
- # built sources that get installed with the header files
--gtk_built_public_sources = @STRIP_BEGIN@ \
-+gtk_built_public_sources =  \
- 	gtkmarshal.h		\
--	gtktypebuiltins.h	\
--@STRIP_END@
--gtk_built_private_headers = @STRIP_BEGIN@ \
--	gtkmarshalers.h		\
--@STRIP_END@
-+	gtktypebuiltins.h
-+
-+gtk_built_private_headers =  \
-+	gtkmarshalers.h
-+
- # built sources that don't get installed
--gtk_built_sources = @STRIP_BEGIN@		\
-+gtk_built_sources = 		\
- 	gtktypebuiltins.c			\
- 	gtkmarshalers.c				\
- 	gtkmarshalers.h				\
- 	gtkmarshal.c				\
- 	${gtk_built_private_headers}		\
--	${gtk_built_public_sources}		\
--@STRIP_END@
--stamp_files = @STRIP_BEGIN@ 		\
-+	${gtk_built_public_sources}
-+
-+stamp_files =  		\
- 	stamp-gtkmarshalers.h		\
- 	stamp-gtkmarshal.h		\
--	stamp-gtktypebuiltins.h		\
--@STRIP_END@
-+	stamp-gtktypebuiltins.h
-+
- # non-header sources (headers should be specified in the above variables)
- # that don't serve as direct make target sources, i.e. they don't have
- # their own .lo rules and don't get publically installed
--gtk_extra_sources = @STRIP_BEGIN@ \
-+gtk_extra_sources =  \
- 	gtkversion.h.in		\
- 	gtkmarshalers.list	\
--	gtkmarshal.list		\
--@STRIP_END@
-+	gtkmarshal.list
- 
- #
- # setup GTK+ sources and their dependencies
-@@ -592,11 +587,10 @@
- 
- TEST_DEPS = $(DEPS) gtk.immodules
- 
--LDADDS = @STRIP_BEGIN@ \
-+LDADDS =  \
- 	$(gtktargetlib)							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
--	$(top_builddir)/gdk/$(gdktargetlib) 				\
--@STRIP_END@
-+	$(top_builddir)/gdk/$(gdktargetlib)
- 
- #
- # Installed tools
-@@ -615,7 +609,7 @@
- 	  echo $$p; \
- 	done
- 
--EXTRA_DIST += @STRIP_BEGIN@ 	\
-+EXTRA_DIST +=  	\
- 	line-arrow.xbm 		\
- 	line-wrap.xbm 		\
- 	tree_plus.xbm		\
-@@ -629,9 +623,8 @@
- 	gtkrc.key.default	\
- 	gtkrc.key.emacs		\
- 	makefile.msc		\
--	makefile.msc.in		\
--@STRIP_END@
-+	makefile.msc.in
- 
- install-data-local:
- 
-
---- gdk/Makefile.am.old	2003-09-03 20:49:25.000000000 +0100
-+++ gdk/Makefile.am	2004-03-07 12:18:18.000000000 +0000
-@@ -10,7 +10,7 @@
- 	makeenums.pl		\
- 	makefile.msc
- 
--common_includes = @STRIP_BEGIN@ 	\
-+common_includes =  	\
- 	-DG_LOG_DOMAIN=\"Gdk\"		\
- 	-DGDK_COMPILATION		\
- 	-I$(top_srcdir)			\
-@@ -20,8 +20,7 @@
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
- 	-DGDK_DISABLE_DEPRECATED	\
- 	@GTK_DEBUG_FLAGS@ 		\
--	@GDK_DEP_CFLAGS@		\
--@STRIP_END@
-+	@GDK_DEP_CFLAGS@
- 
- INCLUDES = $(common_includes)
- gtarget=@gdktarget@
-@@ -69,7 +68,7 @@
- # libtool stuff: set version and export symbols for resolving
- # since automake doesn't support conditionalized libsomething_la_LDFLAGS
- # we use the general approach here
--LDFLAGS = @STRIP_BEGIN@ 						\
-+AM_LDFLAGS =  						\
- 	@LDFLAGS@							\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
- 	-export-dynamic 						\
-@@ -77,8 +76,7 @@
- 	$(no_undefined)							\
- 	@LIBTOOL_EXPORT_OPTIONS@					\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
--	$(gdk_win32_symbols)						\
--@STRIP_END@
-+	$(gdk_win32_symbols)
- 
- #
- # setup source file variables
-@@ -88,7 +86,7 @@
- #
- # Note: files added here may need to be be propagated to gdk_headers in gtk/Makefile.am
- #
--gdk_public_h_sources = @STRIP_BEGIN@		\
-+gdk_public_h_sources = 		\
- 	gdk.h					\
- 	gdkcolor.h				\
- 	gdkcursor.h				\
-@@ -114,16 +112,14 @@
- 	gdkselection.h				\
- 	gdktypes.h				\
- 	gdkvisual.h				\
--	gdkwindow.h				\
--@STRIP_END@
-+	gdkwindow.h
- 
--gdk_headers = @STRIP_BEGIN@       \
-+gdk_headers =        \
- 	$(gdk_public_h_sources)   \
- 	gdkenumtypes.h		  \
--	gdkprivate.h		  \
--@STRIP_END@
-+	gdkprivate.h
- 
--gdk_c_sources = @STRIP_BEGIN@ 	\
-+gdk_c_sources =  	\
- 	gdk.c			\
- 	gdkcolor.c		\
- 	gdkcursor.c		\
-@@ -153,8 +149,7 @@
- 	gdkscreen.c		\
- 	gdkselection.c		\
- 	gdkvisual.c		\
--	gdkwindow.c		\
--@STRIP_END@
-+	gdkwindow.c
- 
- #
- # setup GDK sources and their dependencies
-@@ -164,11 +159,10 @@
- gdkinclude_HEADERS = $(gdk_headers)
- 
- # gdkmarshalers.c is not here becuase it is currently an empty file
--common_sources = @STRIP_BEGIN@	\
-+common_sources = 	\
- 	$(gdk_c_sources)	\
- 	gdkenumtypes.c		\
--	gdkmarshalers.h		\
--@STRIP_END@
-+	gdkmarshalers.h
- 
- libgdk_x11_2_0_la_SOURCES = $(common_sources)
- libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
---- gdk-pixbuf/Makefile.am.old	2003-01-27 23:19:07.000000000 +0000
-+++ gdk-pixbuf/Makefile.am	2004-03-07 12:19:11.000000000 +0000
-@@ -238,7 +238,7 @@
- endif
- 
- DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
--INCLUDES = @STRIP_BEGIN@ 			\
-+INCLUDES =  			\
- 	-DG_LOG_DOMAIN=\"GdkPixbuf\"		\
- 	-I$(top_srcdir) -I$(top_builddir) 	\
- 	-I$(top_srcdir)/gdk-pixbuf 		\
-@@ -252,8 +252,7 @@
- 	@INCLUDED_LOADER_DEFINE@ 		\
- 	@GTK_DEBUG_FLAGS@			\
- 	@GDK_PIXBUF_DEP_CFLAGS@			\
--	-DGDK_PIXBUF_ENABLE_BACKEND		\
--@STRIP_END@
-+	-DGDK_PIXBUF_ENABLE_BACKEND
- 
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-@@ -281,7 +280,7 @@
- # The GdkPixBuf library
- #
- libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
--libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
-+libgdk_pixbuf_2_0_la_SOURCES =  \
- 	gdk-pixbuf-i18n.h	\
- 	gdk-pixbuf.c		\
- 	gdk-pixbuf-animation.c	\
-@@ -291,14 +290,13 @@
- 	gdk-pixbuf-scale.c	\
- 	gdk-pixbuf-util.c	\
- 	gdk-pixdata.c		\
--	$(gdk_pixbuf_built_cfiles) \
--@STRIP_END@
--libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
-+	$(gdk_pixbuf_built_cfiles)
-+
-+libgdk_pixbuf_2_0_la_LDFLAGS =  \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
- 	@LIBTOOL_EXPORT_OPTIONS@				\
- 	$(no_undefined)						\
--	$(gdk_pixbuf_symbols)					\
--@STRIP_END@
-+	$(gdk_pixbuf_symbols)
- 
- libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
- libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo)
---- demos/Makefile.am.old	2003-06-06 01:52:59.000000000 +0100
-+++ demos/Makefile.am	2004-03-07 12:20:23.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- SUBDIRS = gtk-demo
- 
--INCLUDES = @STRIP_BEGIN@ \
-+INCLUDES =  \
- 	-I$(top_srcdir) 				\
- 	-I$(top_builddir)/gdk				\
- 	-DG_DISABLE_DEPRECATED	 			\
-@@ -10,19 +10,17 @@
- 	-DGDK_DISABLE_DEPRECATED			\
- 	-DGTK_DISABLE_DEPRECATED			\
- 	@GTK_DEBUG_FLAGS@				\
--	@GTK_DEP_CFLAGS@				\
--@STRIP_END@
-+	@GTK_DEP_CFLAGS@
- 
- DEPS = \
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@ 				\
- 	$(top_builddir)/gtk/@gtktargetlib@
- 
--LDADDS = @STRIP_BEGIN@ 							\
-+LDADDS =  							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
--	$(top_builddir)/gtk/@gtktargetlib@ 				\
--@STRIP_END@
-+	$(top_builddir)/gtk/@gtktargetlib@
- 
- noinst_PROGRAMS = 		\
- 	testpixbuf 		\
---- docs/faq/Makefile.am.old	2002-03-06 03:59:12.000000000 +0000
-+++ docs/faq/Makefile.am	2004-03-07 12:23:40.000000000 +0000
-@@ -14,15 +14,6 @@
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
- else
--html:
--	echo "***"
--	echo "*** Warning: FAQ not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: FAQ not built"
--	echo "***"
- 
- dist-hook:
- 	echo "***"
---- docs/tutorial/Makefile.am.old	2002-03-06 03:59:12.000000000 +0000
-+++ docs/tutorial/Makefile.am	2004-03-07 12:24:42.000000000 +0000
-@@ -49,15 +49,6 @@
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
- else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
- 
- dist-hook:
- 	echo "***"
---- demos/gtk-demo/Makefile.am.old	2003-06-09 22:58:32.000000000 +0100
-+++ demos/gtk-demo/Makefile.am	2004-03-07 12:25:47.000000000 +0000
-@@ -4,7 +4,7 @@
- 
- ## These should be in the order you want them to appear in the 
- ## demo app, which means alphabetized by demo title, not filename
--demos = @STRIP_BEGIN@	\
-+demos = 	\
- 	appwindow.c	\
- 	button_box.c	\
- 	changedisplay.c	\
-@@ -21,10 +21,9 @@
- 	sizegroup.c	\
- 	stock_browser.c	\
- 	textview.c	\
--	tree_store.c	\
--@STRIP_END@
-+	tree_store.c
- 
--INCLUDES = @STRIP_BEGIN@ \
-+INCLUDES =  \
- 	-DDEMOCODEDIR="\"$(democodedir)\""		\
- 	-I$(top_srcdir) 				\
- 	-I$(top_builddir)/gdk				\
-@@ -33,19 +32,17 @@
- 	-DGDK_DISABLE_DEPRECATED			\
- 	-DGTK_DISABLE_DEPRECATED 			\
- 	@GTK_DEBUG_FLAGS@				\
--	@GTK_DEP_CFLAGS@				\
--@STRIP_END@
-+	@GTK_DEP_CFLAGS@
- 
- DEPS = \
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@ 				\
- 	$(top_builddir)/gtk/@gtktargetlib@
- 
--LDADDS = @STRIP_BEGIN@ 							\
-+LDADDS =  							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
--	$(top_builddir)/gtk/@gtktargetlib@ 				\
--@STRIP_END@
-+	$(top_builddir)/gtk/@gtktargetlib@
- 
- bin_PROGRAMS = gtk-demo
- 
diff --git a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch b/packages/gtk+/gtk+-2.2.4/configure-lossage.patch
deleted file mode 100644
index 04b789675d..0000000000
--- a/packages/gtk+/gtk+-2.2.4/configure-lossage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in~	2003-09-04 18:06:42.000000000 +0100
-+++ configure.in	2004-03-07 12:28:12.000000000 +0000
-@@ -963,7 +963,8 @@
- 
-       AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
-       AC_TRY_COMPILE([
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include FT_ERRORS_H
-     ],
- 	             [(void)1;],:,have_freetype=false)
diff --git a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4 b/packages/gtk+/gtk+-2.2.4/glib-2.0.m4
deleted file mode 100644
index 28ccef4a5f..0000000000
--- a/packages/gtk+/gtk+-2.2.4/glib-2.0.m4
+++ /dev/null
@@ -1,212 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  no_glib=""
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_glib=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_glib=yes
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  rm -f conf.glibtest
-])
diff --git a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4 b/packages/gtk+/gtk+-2.2.4/glib-gettext.m4
deleted file mode 100644
index 862db40a93..0000000000
--- a/packages/gtk+/gtk+-2.2.4/glib-gettext.m4
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-          [return (int) dgettext ("","")],
-	  gt_cv_func_dgettext_libc=yes,
-          gt_cv_func_dgettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, dgettext,
-		          gt_cv_func_dgettext_libintl=yes)])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-          AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
diff --git a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch b/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
deleted file mode 100644
index d291cbdd69..0000000000
--- a/packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	2004-03-14 23:30:31.000000000 +0000
-+++ configure.in	2004-03-15 00:00:51.000000000 +0000
-@@ -340,7 +340,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
-+    deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
-     if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -664,7 +664,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
diff --git a/packages/gtk+/gtk+-2.2.4/no-demos.patch b/packages/gtk+/gtk+-2.2.4/no-demos.patch
deleted file mode 100644
index 7a44943d4a..0000000000
--- a/packages/gtk+/gtk+-2.2.4/no-demos.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- gtk+-2.2.4/Makefile.am~no-demos	2003-01-30 22:40:35.000000000 +0100
-+++ gtk+-2.2.4/Makefile.am	2004-03-11 11:49:43.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
- 
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po $(SRC_SUBDIRS) docs build m4macros
- 
- # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.2.4/no-xwc.patch b/packages/gtk+/gtk+-2.2.4/no-xwc.patch
deleted file mode 100644
index e1ee5cb5c8..0000000000
--- a/packages/gtk+/gtk+-2.2.4/no-xwc.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- gdk/x11/gdkdrawable-x11.c~	2003-08-18 17:02:39.000000000 +0100
-+++ gdk/x11/gdkdrawable-x11.c	2004-03-29 21:30:17.000000000 +0100
-@@ -636,12 +636,14 @@
- 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- 	}
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
-       XmbDrawString (xdisplay, impl->xid,
- 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-@@ -673,6 +675,7 @@
-                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
-       g_free (text_8bit);
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -693,7 +696,8 @@
- 	  g_free (text_wchar);
- 	}
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-
---- gdk/x11/gdkim-x11.c~	2002-11-01 00:45:32.000000000 +0000
-+++ gdk/x11/gdkim-x11.c	2004-03-29 21:28:30.000000000 +0100
-@@ -51,6 +51,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
-   wchar_t result;
-   gchar *current_locale;
-   static char *last_locale = NULL;
-@@ -96,6 +97,7 @@
-   GDK_NOTE (XIM,
- 	    g_message ("%s multi-byte string functions.", 
- 		       gdk_use_mb ? "Using" : "Not using"));
-+#endif
-   
-   return;
- }
-@@ -139,6 +141,7 @@
- {
-   gchar *mbstr;
- 
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -177,6 +180,7 @@
-       XFree (tpr.value);
-     }
-   else
-+#endif
-     {
-       gint length = 0;
-       gint i;
-@@ -209,6 +213,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -241,7 +246,8 @@
-       return len_cpy;
-     }
-   else
-+#endif
-     {
-       gint i;
- 
-
---- gdk/x11/gdkfont-x11.c~	2003-03-06 20:17:55.000000000 +0000
-+++ gdk/x11/gdkfont-x11.c	2004-03-29 21:29:40.000000000 +0100
-@@ -594,10 +594,12 @@
- 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- 	}
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       width = XmbTextEscapement (fontset, text, text_length);
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -647,6 +649,7 @@
-           width = 0;
-         }
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
- 	{
-@@ -664,6 +667,7 @@
- 	  g_free (text_wchar);
- 	}
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -736,6 +740,7 @@
-       if (descent)
- 	*descent = overall.descent;
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -750,6 +755,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-@@ -822,6 +828,7 @@
- 	  *descent = overall.descent;
- 	break;
-       }
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
- 
-@@ -849,6 +856,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
diff --git a/packages/gtk+/gtk+-2.4.13/automake-lossage.patch b/packages/gtk+/gtk+-2.4.13/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.4.13/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch b/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.4.13/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- gtk+-2.4.1/gtk/gtkarrow.c	2004-03-13 09:51:13.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkarrow.c	2004-05-26 14:52:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #include "gtkarrow.h"
- #include "gtkintl.h"
- 
--#define MIN_ARROW_SIZE  15
-+#define MIN_ARROW_SIZE  7
- 
- enum {
-   PROP_0,
-@@ -53,6 +53,8 @@
- 				    guint            prop_id,
- 				    GValue          *value,
- 				    GParamSpec      *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow, 
-+				    GtkRequisition *requisition);
- 
- GType
- gtk_arrow_get_type (void)
-@@ -111,6 +113,7 @@
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-   widget_class->expose_event = gtk_arrow_expose;
-+  widget_class->size_request = gtk_arrow_size_request;
- }
- 
- static void
-@@ -166,13 +169,18 @@
- }
- 
- static void
-+gtk_arrow_size_request (GtkWidget *arrow, 
-+			GtkRequisition *requisition)
-+{
-+  requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+  requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
-   GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
- 
--  GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
--  GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
-   arrow->arrow_type = GTK_ARROW_RIGHT;
-   arrow->shadow_type = GTK_SHADOW_OUT;
- }
---- gtk+-2.4.1/gtk/gtkcalendar.c	2004-03-06 14:37:26.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkcalendar.c	2004-05-26 14:58:57.000000000 +1000
-@@ -340,6 +340,9 @@
- static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
- 					       guint        day);
- 
-+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
-+					guint	      day);
-+
- static void gtk_calendar_paint_arrow	(GtkWidget    *widget,
- 					 guint	       arrow);
- static void gtk_calendar_paint_day_num	(GtkWidget    *widget,
-@@ -861,13 +864,13 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
-     {
-       if (calendar->selected_day < 0)
- 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
--      gtk_calendar_select_day (calendar, calendar->selected_day);
-+      gtk_calendar_do_select_day (calendar, calendar->selected_day);
-     }
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-@@ -908,10 +911,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -939,10 +942,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -974,10 +977,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
--    gtk_calendar_select_day (calendar, calendar->selected_day);
-+    gtk_calendar_do_select_day (calendar, calendar->selected_day);
-   
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-   gtk_calendar_thaw (calendar);
-@@ -2480,9 +2483,9 @@
-   return TRUE;
- }
- 
--void
--gtk_calendar_select_day (GtkCalendar *calendar,
--			 guint	      day)
-+static void
-+gtk_calendar_do_select_day (GtkCalendar *calendar,
-+			    guint	      day)
- {
-   g_return_if_fail (GTK_IS_CALENDAR (calendar));
-   g_return_if_fail (day <= 31);
-@@ -2499,6 +2502,13 @@
-       if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
- 	gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-     }
-+}
-+
-+void
-+gtk_calendar_select_day (GtkCalendar *calendar,
-+			 guint	      day)
-+{
-+  gtk_calendar_do_select_day (calendar, day);
-   
-   calendar->selected_day = day;
-   
---- gtk+-2.4.1/gtk/gtkentry.c	2004-04-22 08:08:08.000000000 +1000
-+++ gtk+-2.4.1/gtk/gtkentry.c	2004-05-26 14:52:17.000000000 +1000
-@@ -557,6 +557,15 @@
- 						       0.0,
- 						       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("min_width",
-+                                                             _("Minimum width"),
-+                                                             _("Minimum width of the entry field"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             MIN_ENTRY_WIDTH,
-+                                                             G_PARAM_READABLE));
-+
-   signals[POPULATE_POPUP] =
-     g_signal_new ("populate_popup",
- 		  G_OBJECT_CLASS_TYPE (gobject_class),
-@@ -1124,7 +1133,7 @@
- {
-   GtkEntry *entry = GTK_ENTRY (widget);
-   PangoFontMetrics *metrics;
--  gint xborder, yborder;
-+  gint xborder, yborder, min_width;
-   PangoContext *context;
-   
-   gtk_widget_ensure_style (widget);
-@@ -1140,9 +1149,11 @@
-   
-   xborder += INNER_BORDER;
-   yborder += INNER_BORDER;
--  
-+
-+  gtk_widget_style_get (widget, "min_width", &min_width, NULL);
-+
-   if (entry->width_chars < 0)
--    requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
-+    requisition->width = min_width + xborder * 2;
-   else
-     {
-       gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
---- gtk+-2.4.1/gtk/gtkrange.c	2004-03-06 14:38:08.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkrange.c	2004-05-26 14:52:17.000000000 +1000
-@@ -180,6 +180,7 @@
- static GtkWidgetClass *parent_class = NULL;
- static guint signals[LAST_SIGNAL];
- 
-+static GdkAtom recognize_protocols_atom, atom_atom;
- 
- GType
- gtk_range_get_type (void)
-@@ -220,6 +221,9 @@
-   object_class = (GtkObjectClass*) class;
-   widget_class = (GtkWidgetClass*) class;
- 
-+  recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
-+  atom_atom = gdk_atom_intern ("ATOM", FALSE);
-+
-   parent_class = g_type_class_peek_parent (class);
- 
-   gobject_class->set_property = gtk_range_set_property;
-@@ -815,6 +819,12 @@
- 					&attributes, attributes_mask);
-   gdk_window_set_user_data (range->event_window, range);
- 
-+  gdk_property_change (range->event_window,
-+		       recognize_protocols_atom,
-+		       atom_atom,
-+		       32, GDK_PROP_MODE_REPLACE,
-+		       NULL, 0);
-+
-   widget->style = gtk_style_attach (widget->style, widget->window);
- }
- 
-@@ -1186,7 +1196,7 @@
- 
-   /* ignore presses when we're already doing something else. */
-   if (range->layout->grab_location != MOUSE_OUTSIDE)
--    return FALSE;
-+    return TRUE;
- 
-   range->layout->mouse_x = event->x;
-   range->layout->mouse_y = event->y;
-@@ -1364,7 +1374,7 @@
-       return TRUE;
-     }
- 
--  return FALSE;
-+  return TRUE;
- }
- 
- /**
diff --git a/packages/gtk+/gtk+-2.4.13/gtk-doc.m4 b/packages/gtk+/gtk+-2.4.13/gtk-doc.m4
deleted file mode 100644
index 3ec41666b2..0000000000
--- a/packages/gtk+/gtk+-2.4.13/gtk-doc.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff --git a/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch b/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch
deleted file mode 100644
index df29656343..0000000000
--- a/packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~	2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c	2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch
deleted file mode 100644
index 9da8dd8cf1..0000000000
--- a/packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gtk+-2.4.1/configure.in	2004-05-01 02:02:06.000000000 +1000
-+++ gtk+-2.4.1/configure.in	2004-06-03 13:26:41.000000000 +1000
-@@ -350,7 +350,7 @@
- AC_MSG_CHECKING([Whether to write dependencies into .pc files])
- case $enable_explicit_deps in
-   auto)
--    deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
-+    deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
-     if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
-       enable_explicit_deps=yes  
-     else
-@@ -669,7 +669,7 @@
-     dnl Now we check to see if our libtool supports shared lib deps
-     dnl (in a rather ugly way even)
-     if $dynworks; then
--        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh}  $host_alias-libtool --config"
-         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1441,7 +1441,7 @@
- #  export list from -export-symbols-regex is ignored and everything
- #  is exported
- #	
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- if test -n "$export_dynamic"; then
-   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch b/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch
deleted file mode 100644
index 29e665fbf3..0000000000
--- a/packages/gtk+/gtk+-2.4.13/menu-deactivate.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.4.4/gtk/gtkmenushell.c.old	Thu Aug 26 23:45:28 2004
-+++ gtk+-2.4.4/gtk/gtkmenushell.c	Fri Aug 27 00:13:33 2004
-@@ -37,7 +37,7 @@
- #include "gtktearoffmenuitem.h"
- #include "gtkwindow.h"
- 
--#define MENU_SHELL_TIMEOUT   500
-+#define MENU_SHELL_TIMEOUT   2000
- 
- enum {
-   DEACTIVATE,
-@@ -156,6 +156,7 @@
- static GtkContainerClass *parent_class = NULL;
- static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
- 
-+static int last_crossing_time;
- 
- GType
- gtk_menu_shell_get_type (void)
-@@ -418,6 +419,7 @@
-       gtk_grab_add (GTK_WIDGET (menu_shell));
-       menu_shell->have_grab = TRUE;
-       menu_shell->active = TRUE;
-+      last_crossing_time = 0;
-     }
- }
- 
-@@ -545,6 +547,13 @@
- 	  menu_shell->activate_time = 0;
- 	  deactivate = FALSE;
- 	}
-+
-+      if (last_crossing_time != 0
-+	  && ((event->time - last_crossing_time) < 500))
-+	{
-+	  last_crossing_time = 0;
-+	  deactivate = FALSE;
-+	}
-       
-       if (deactivate)
- 	{
-@@ -597,6 +606,8 @@
-   if (menu_shell->active)
-     {
-       menu_item = gtk_get_event_widget ((GdkEvent*) event);
-+
-+      last_crossing_time = event->time;
- 
-       if (!menu_item ||
- 	  (GTK_IS_MENU_ITEM (menu_item) && 
diff --git a/packages/gtk+/gtk+-2.4.13/no-demos.patch b/packages/gtk+/gtk+-2.4.13/no-demos.patch
deleted file mode 100644
index 2f10a30dda..0000000000
--- a/packages/gtk+/gtk+-2.4.13/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.1/Makefile.am~	2004-01-17 22:15:56.000000000 +0000
-+++ gtk+-2.4.1/Makefile.am	2004-05-08 12:25:32.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
- 
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
- 
- # require automake 1.4
diff --git a/packages/gtk+/gtk+-2.4.13/no-xwc.patch b/packages/gtk+/gtk+-2.4.13/no-xwc.patch
deleted file mode 100644
index e1ee5cb5c8..0000000000
--- a/packages/gtk+/gtk+-2.4.13/no-xwc.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- gdk/x11/gdkdrawable-x11.c~	2003-08-18 17:02:39.000000000 +0100
-+++ gdk/x11/gdkdrawable-x11.c	2004-03-29 21:30:17.000000000 +0100
-@@ -636,12 +636,14 @@
- 			 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
- 	}
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
-       XmbDrawString (xdisplay, impl->xid,
- 		     fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-@@ -673,6 +675,7 @@
-                    GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
-       g_free (text_8bit);
-     }
-+#ifdef HAVE_XWC
-   else if (font->type == GDK_FONT_FONTSET)
-     {
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
-@@ -693,7 +696,8 @@
- 	  g_free (text_wchar);
- 	}
-     }
-+#endif
-   else
-     g_error("undefined font type\n");
- }
-
---- gdk/x11/gdkim-x11.c~	2002-11-01 00:45:32.000000000 +0000
-+++ gdk/x11/gdkim-x11.c	2004-03-29 21:28:30.000000000 +0100
-@@ -51,6 +51,7 @@
- void
- _gdk_x11_initialize_locale (void)
- {
-+#ifdef HAVE_XWC
-   wchar_t result;
-   gchar *current_locale;
-   static char *last_locale = NULL;
-@@ -96,6 +97,7 @@
-   GDK_NOTE (XIM,
- 	    g_message ("%s multi-byte string functions.", 
- 		       gdk_use_mb ? "Using" : "Not using"));
-+#endif
-   
-   return;
- }
-@@ -139,6 +141,7 @@
- {
-   gchar *mbstr;
- 
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -177,6 +180,7 @@
-       XFree (tpr.value);
-     }
-   else
-+#endif
-     {
-       gint length = 0;
-       gint i;
-@@ -209,6 +213,7 @@
- gint
- gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
- {
-+#ifdef HAVE_XWC
-   if (gdk_use_mb)
-     {
-       GdkDisplay *display = find_a_display ();
-@@ -241,7 +246,8 @@
-       return len_cpy;
-     }
-   else
-+#endif
-     {
-       gint i;
- 
-
---- gdk/x11/gdkfont-x11.c~	2003-03-06 20:17:55.000000000 +0000
-+++ gdk/x11/gdkfont-x11.c	2004-03-29 21:29:40.000000000 +0100
-@@ -594,10 +594,12 @@
- 	  width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
- 	}
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       width = XmbTextEscapement (fontset, text, text_length);
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -647,6 +649,7 @@
-           width = 0;
-         }
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       if (sizeof(GdkWChar) == sizeof(wchar_t))
- 	{
-@@ -664,6 +667,7 @@
- 	  g_free (text_wchar);
- 	}
-       break;
-+#endif
-     default:
-       width = 0;
-     }
-@@ -736,6 +740,7 @@
-       if (descent)
- 	*descent = overall.descent;
-       break;
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
-       XmbTextExtents (fontset, text, text_length, &ink, &logical);
-@@ -750,6 +755,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
-@@ -822,6 +828,7 @@
- 	  *descent = overall.descent;
- 	break;
-       }
-+#ifdef HAVE_XWC
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
- 
-@@ -849,6 +856,7 @@
-       if (descent)
- 	*descent = ink.y + ink.height;
-       break;
-+#endif
-     }
- 
- }
diff --git a/packages/gtk+/gtk+-2.4.13/scroll-timings.patch b/packages/gtk+/gtk+-2.4.13/scroll-timings.patch
deleted file mode 100644
index a38b21dcc2..0000000000
--- a/packages/gtk+/gtk+-2.4.13/scroll-timings.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.4.4/gtk/gtkrange.c~	2004-08-23 01:50:22.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkrange.c	2004-08-27 15:48:49.000000000 +0100
-@@ -35,9 +35,9 @@
- #include "gtkintl.h"
- #include "gtkscrollbar.h"
- 
--#define SCROLL_INITIAL_DELAY 250  /* must hold button this long before ... */
--#define SCROLL_LATER_DELAY   100  /* ... it starts repeating at this rate  */
--#define UPDATE_DELAY         300  /* Delay for queued update */
-+#define SCROLL_INITIAL_DELAY 500  /* must hold button this long before ... */
-+#define SCROLL_LATER_DELAY   200  /* ... it starts repeating at this rate  */
-+#define UPDATE_DELAY         1000  /* Delay for queued update */
- 
- enum {
-   PROP_0,
diff --git a/packages/gtk+/gtk+-2.4.13/single-click.patch b/packages/gtk+/gtk+-2.4.13/single-click.patch
deleted file mode 100644
index 21adb9b7b0..0000000000
--- a/packages/gtk+/gtk+-2.4.13/single-click.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtkcalendar.c gtk+-2.4.4/gtk/gtkcalendar.c
---- ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtkcalendar.c	2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkcalendar.c	2004-09-18 12:41:28.000000000 +0100
-@@ -1026,9 +1026,8 @@
-       private_data->drag_start_y = y;
- 
-       gtk_calendar_select_and_focus_day (calendar, day);
--    }
--  else if (event->type == GDK_2BUTTON_PRESS)
--    {
-+
-+	  // Double-click action follows
-       private_data->in_drag = 0;
-       if (day_month == MONTH_CURRENT)
- 	g_signal_emit (calendar,
-diff -urNd ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtktreeview.c gtk+-2.4.4/gtk/gtktreeview.c
---- ../gtk+-2.4.4-r7/gtk+-2.4.4/gtk/gtktreeview.c	2004-07-10 05:02:11.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtktreeview.c	2004-09-18 13:49:23.000000000 +0100
-@@ -2180,7 +2180,8 @@
-       tree_view->priv->focus_column = column;
- 
-       /* decide if we edit */
--      if (event->type == GDK_BUTTON_PRESS && event->button == 1 &&
-+      /* Changed from button 1 to 2 so as not to conflict with the single-click activation */
-+      if (event->type == GDK_BUTTON_PRESS && event->button == 2 &&
- 	  !(event->state & gtk_accelerator_get_default_mod_mask ()))
- 	{
- 	  GtkTreePath *anchor;
-@@ -2305,16 +2306,13 @@
-       /* Test if a double click happened on the same row. */
-       if (event->button == 1)
-         {
--          /* We also handle triple clicks here, because a user could have done
--           * a first click and a second double click on different rows.
-+          /* Replaced double/triple click with single-click for PDAs.
-            */
--          if ((event->type == GDK_2BUTTON_PRESS
--               || event->type == GDK_3BUTTON_PRESS)
--              && tree_view->priv->last_button_press)
-+          if (event->type == GDK_BUTTON_PRESS)
-             {
-               GtkTreePath *lsc;
- 
--              lsc = gtk_tree_row_reference_get_path (tree_view->priv->last_button_press);
-+              lsc = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
- 
-               if (lsc)
-                 {
diff --git a/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch b/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch
deleted file mode 100644
index 20bf4cf366..0000000000
--- a/packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c
---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c	2004-07-10 05:02:10.000000000 +0100
-+++ gtk+-2.4.4/gtk/gtkfilesel.c	2004-09-13 13:40:09.000000000 +0100
-@@ -68,6 +68,7 @@
- #include "gtkprivate.h"
- #include "gtkscrolledwindow.h"
- #include "gtkstock.h"
-+#include "gtksignal.h"
- #include "gtktreeselection.h"
- #include "gtktreeview.h"
- #include "gtkvbox.h"
-@@ -77,6 +78,7 @@
- #include "gtkmessagedialog.h"
- #include "gtkdnd.h"
- #include "gtkeventbox.h"
-+#include "gtkimage.h"
- 
- #undef GTK_DISABLE_DEPRECATED
- #include "gtkoptionmenu.h"
-@@ -245,7 +247,8 @@
- };
- 
- enum {
--  DIR_COLUMN
-+  DIR_COLUMN,
-+  ISFILE_COLUMN
- };
- 
- enum {
-@@ -400,6 +403,12 @@
- 					      GtkTreePath       *path,
- 					      GtkTreeViewColumn *column,
- 					      gpointer           user_data);
-+
-+static void gtk_file_selection_activate (GtkTreeView       *tree_view,
-+					 GtkTreePath       *path,
-+					 GtkTreeViewColumn *column,
-+					 gpointer           user_data);
-+
- static void gtk_file_selection_file_changed  (GtkTreeSelection  *selection,
- 					      gpointer           user_data);
- static void gtk_file_selection_dir_activate  (GtkTreeView       *tree_view,
-@@ -419,6 +428,7 @@
- static void gtk_file_selection_create_dir  (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data);
- static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data);
-+static void gtk_file_selection_style_set (GtkWidget *widget, GtkStyle  *prev_style);
- 
- static void free_selected_names (GPtrArray *names);
- 
-@@ -578,6 +588,23 @@
- 							 G_PARAM_WRITABLE));
-   object_class->destroy = gtk_file_selection_destroy;
-   widget_class->map = gtk_file_selection_map;
-+  widget_class->style_set = gtk_file_selection_style_set;
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_boolean ("show_fileops_default",
-+								 _("Show fileop buttons by default"),
-+								 _("Whether file operation buttons are shown by default"),
-+								 TRUE,
-+								 G_PARAM_READABLE));
-+
-+  gtk_widget_class_install_style_property (widget_class,
-+					   g_param_spec_int ("border_width",
-+                                                             _("Border width"),
-+                                                             _("Width of border around the main dialog area"),
-+                                                             0,
-+                                                             G_MAXINT,
-+                                                             10,
-+                                                             G_PARAM_READABLE));
- }
- 
- static void gtk_file_selection_set_property (GObject         *object,
-@@ -649,7 +676,29 @@
-   gtk_widget_grab_default (widget);
-   return FALSE;
- }
--     
-+
-+static void
-+gtk_file_selection_style_set (GtkWidget *filesel,
-+			      GtkStyle  *prev_style)
-+{     
-+  gboolean show_fileops;
-+  gint border_width;
-+
-+  gtk_widget_style_get (filesel,
-+                        "show_fileops_default",
-+                        &show_fileops,
-+			"border_width",
-+			&border_width,
-+			NULL);
-+
-+  gtk_container_set_border_width (GTK_CONTAINER (filesel), border_width);
-+
-+  if (show_fileops)
-+    gtk_file_selection_show_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+  else
-+    gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (filesel));
-+}
-+
- static void
- gtk_file_selection_init (GtkFileSelection *filesel)
- {
-@@ -674,17 +723,15 @@
- 
-   /* The dialog-sized vertical box  */
-   filesel->main_vbox = dialog->vbox;
--  gtk_container_set_border_width (GTK_CONTAINER (filesel), 10);
- 
-   /* The horizontal box containing create, rename etc. buttons */
-   filesel->button_area = gtk_hbutton_box_new ();
-   gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START);
--  gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0);
-   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, 
- 		      FALSE, FALSE, 0);
-   gtk_widget_show (filesel->button_area);
-   
--  gtk_file_selection_show_fileop_buttons (filesel);
-+  gtk_file_selection_style_set (GTK_WIDGET (filesel), NULL);
- 
-   /* hbox for pulldown menu */
-   pulldown_hbox = gtk_hbox_new (TRUE, 5);
-@@ -723,25 +770,32 @@
-   
-   /* The directories list */
- 
--  model = gtk_list_store_new (1, G_TYPE_STRING);
-+  model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); /* MA */
-   filesel->dir_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-   g_object_unref (model);
- 
--  column = gtk_tree_view_column_new_with_attributes (_("Folders"),
-+  column = gtk_tree_view_column_new_with_attributes (/*_("Folders")*/ NULL,
- 						     gtk_cell_renderer_text_new (),
- 						     "text", DIR_COLUMN,
- 						     NULL);
-   label = gtk_label_new_with_mnemonic (_("Fol_ders"));
-   gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->dir_list);
-   gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
-+
-+  /* gtk_tree_view_column_set_widget (column, label); */
-+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (filesel->dir_list), FALSE);
-+
-   gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-   gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->dir_list), column);
- 
-   gtk_widget_set_size_request (filesel->dir_list,
- 			       DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
-   g_signal_connect (filesel->dir_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_dir_activate), filesel);
-+		    G_CALLBACK (gtk_file_selection_activate), filesel);
-+
-+  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->dir_list)), "changed",
-+		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
-+
- 
-   /*  gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list)); */
- 
-@@ -758,41 +812,6 @@
-   gtk_widget_show (filesel->dir_list);
-   gtk_widget_show (scrolled_win);
- 
--  /* The files list */
--  model = gtk_list_store_new (1, G_TYPE_STRING);
--  filesel->file_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
--  g_object_unref (model);
--
--  column = gtk_tree_view_column_new_with_attributes (_("Files"),
--						     gtk_cell_renderer_text_new (),
--						     "text", FILE_COLUMN,
--						     NULL);
--  label = gtk_label_new_with_mnemonic (_("_Files"));
--  gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->file_list);
--  gtk_widget_show (label);
--  gtk_tree_view_column_set_widget (column, label);
--  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
--  gtk_tree_view_append_column (GTK_TREE_VIEW (filesel->file_list), column);
--
--  gtk_widget_set_size_request (filesel->file_list,
--			       FILE_LIST_WIDTH, FILE_LIST_HEIGHT);
--  g_signal_connect (filesel->file_list, "row_activated",
--		    G_CALLBACK (gtk_file_selection_file_activate), filesel);
--  g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (filesel->file_list)), "changed",
--		    G_CALLBACK (gtk_file_selection_file_changed), filesel);
--
--  /* gtk_clist_column_titles_passive (GTK_CLIST (filesel->file_list)); */
--
--  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
--  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN);
--  gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list);
--  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
--				  GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
--  gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 0);
--  gtk_container_add (GTK_CONTAINER (list_container), scrolled_win);
--  gtk_widget_show (filesel->file_list);
--  gtk_widget_show (scrolled_win);
--
-   /* action area for packing buttons into. */
-   filesel->action_area = gtk_hbox_new (TRUE, 0);
-   gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, 
-@@ -2008,6 +2027,23 @@
- }
- 
- static void
-+gtk_file_selection_activate (GtkTreeView       *tree_view,
-+			     GtkTreePath       *path,
-+			     GtkTreeViewColumn *column,
-+			     gpointer           user_data)
-+{
-+  GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
-+  GtkTreeIter iter;  
-+  gboolean is_file;
-+
-+  gtk_tree_model_get_iter (model, &iter, path);
-+  gtk_tree_model_get (model, &iter, ISFILE_COLUMN, &is_file, -1);
-+
-+  if (! is_file)
-+    gtk_file_selection_dir_activate (tree_view, path, column, user_data);
-+}
-+
-+static void
- gtk_file_selection_file_activate (GtkTreeView       *tree_view,
- 				  GtkTreePath       *path,
- 				  GtkTreeViewColumn *column,
-@@ -2103,7 +2139,6 @@
-   PossibleCompletion* poss;
-   GtkTreeIter iter;
-   GtkListStore *dir_model;
--  GtkListStore *file_model;
-   gchar* filename;
-   gchar* rem_path = rel_path;
-   gchar* sel_text;
-@@ -2125,10 +2160,8 @@
-   g_assert (cmpl_state->reference_dir);
- 
-   dir_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->dir_list)));
--  file_model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (fs->file_list)));
- 
-   gtk_list_store_clear (dir_model);
--  gtk_list_store_clear (file_model);
- 
-   /* Set the dir list to include ./ and ../ */
-   gtk_list_store_append (dir_model, &iter);
-@@ -2150,13 +2183,17 @@
-                   strcmp (filename, ".." G_DIR_SEPARATOR_S) != 0)
- 		{
- 		  gtk_list_store_append (dir_model, &iter);
--		  gtk_list_store_set (dir_model, &iter, DIR_COLUMN, filename, -1);
-+		  gtk_list_store_set (dir_model, &iter, 
-+				      DIR_COLUMN, filename, 
-+				      ISFILE_COLUMN, FALSE, -1);
- 		}
- 	    }
-           else
- 	    {
--	      gtk_list_store_append (file_model, &iter);
--	      gtk_list_store_set (file_model, &iter, DIR_COLUMN, filename, -1);
-+	      gtk_list_store_append (dir_model, &iter);
-+	      gtk_list_store_set (dir_model, &iter, 
-+				  DIR_COLUMN, filename, 
-+				  ISFILE_COLUMN, TRUE, -1);
-             }
- 	}
- 
diff --git a/packages/gtk+/gtk+-2.4.13/spinbutton.patch b/packages/gtk+/gtk+-2.4.13/spinbutton.patch
deleted file mode 100644
index 8ad7507af0..0000000000
--- a/packages/gtk+/gtk+-2.4.13/spinbutton.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- gtk+-2.4.3/gtk/gtkspinbutton.c.old	2004-04-22 14:49:27.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtkspinbutton.c	2004-06-30 21:48:18.000000000 +0100
-@@ -733,7 +733,7 @@
- 
-   spin = GTK_SPIN_BUTTON (widget);
-   arrow_size = spin_button_get_arrow_size (spin);
--  panel_width = arrow_size + 2 * widget->style->xthickness;
-+  panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
-   
-   widget->allocation = *allocation;
-   
-@@ -866,19 +866,16 @@
-     {
-       width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
- 
-+      y = widget->style->ythickness;
-+      height = widget->requisition.height - (2 * y);
-+
-       if (arrow_type == GTK_ARROW_UP)
- 	{
- 	  x = 0;
--	  y = 0;
--
--	  height = widget->requisition.height / 2;
- 	}
-       else
- 	{
--	  x = 0;
--	  y = widget->requisition.height / 2;
--
--	  height = (widget->requisition.height + 1) / 2;
-+	  x = width;
- 	}
- 
-       if (spin_button_at_limit (spin_button, arrow_type))
-@@ -908,32 +905,17 @@
- 	      shadow_type = GTK_SHADOW_OUT;
- 	    }
- 	}
--      
-+
-       gtk_paint_box (widget->style, spin_button->panel,
- 		     state_type, shadow_type,
- 		     NULL, widget,
--		     (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
-+		     NULL,
- 		     x, y, width, height);
- 
-       height = widget->requisition.height;
- 
--      if (arrow_type == GTK_ARROW_DOWN)
--	{
--	  y = height / 2;
--	  height = height - y - 2;
--	}
--      else
--	{
--	  y = 2;
--	  height = height / 2 - 2;
--	}
--
-       width -= 3;
--
--      if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
--	x = 2;
--      else
--	x = 1;
-+      height -= 3;
- 
-       w = width / 2;
-       w -= w % 2 - 1; /* force odd */
-@@ -1108,7 +1090,7 @@
- 	  if (GTK_ENTRY (widget)->editable)
- 	    gtk_spin_button_update (spin);
- 	  
--	  if (event->y <= widget->requisition.height / 2)
-+	  if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
- 	    {
- 	      if (event->button == 1)
- 		start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
-@@ -1143,44 +1125,11 @@
- 
-   arrow_size = spin_button_get_arrow_size (spin);
- 
--  if (event->button == spin->button)
--    {
--      int click_child = spin->click_child;
-+  gtk_spin_button_stop_spinning (spin);
- 
--      gtk_spin_button_stop_spinning (spin);
--
--      if (event->button == 3)
--	{
--	  if (event->y >= 0 && event->x >= 0 && 
--	      event->y <= widget->requisition.height &&
--	      event->x <= arrow_size + 2 * widget->style->xthickness)
--	    {
--	      if (click_child == GTK_ARROW_UP &&
--		  event->y <= widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->upper - spin->adjustment->value;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, diff);
--		}
--	      else if (click_child == GTK_ARROW_DOWN &&
--		       event->y > widget->requisition.height / 2)
--		{
--		  gdouble diff;
--
--		  diff = spin->adjustment->value - spin->adjustment->lower;
--		  if (diff > EPSILON)
--		    gtk_spin_button_real_spin (spin, -diff);
--		}
--	    }
--	}		  
--      spin_button_redraw (spin);
-+  spin_button_redraw (spin);
- 
--      return TRUE;
--    }
--  else
--    return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-+  return TRUE;
- }
- 
- static gint
diff --git a/packages/gtk+/gtk+-2.4.13/xsettings.patch b/packages/gtk+/gtk+-2.4.13/xsettings.patch
deleted file mode 100644
index b63e262d34..0000000000
--- a/packages/gtk+/gtk+-2.4.13/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old	Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c	Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 
diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb
deleted file mode 100644
index eb308edca2..0000000000
--- a/packages/gtk+/gtk+_2.2.4.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "pango atk jpeg libpng libxext"
-
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
-           http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \
-           file://automake-lossage.patch;patch=1;pnum=0 \
-           file://configure-lossage.patch;patch=1;pnum=0 \
-           file://no-demos.patch;patch=1 \
-           file://libtool-lossage.patch;patch=1;pnum=0 \
-           file://no-xwc.patch;patch=1;pnum=0 \
-           file://glib-2.0.m4 \
-           file://glib-gettext.m4"
-
-inherit autotools  pkgconfig
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/glib-2.0.m4 m4/
-	install ${WORKDIR}/glib-gettext.m4 m4/
-}
-
-EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft"
-
-LIBV = "2.2.0"
-
-gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h"
-gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdkdnd.h gdkdrawable.h gdkenumtypes.h gdkevents.h gdkfont.h gdkgc.h gdki18n.h gdkimage.h gdkinput.h gdkkeys.h gdkkeysyms.h gdkpango.h gdkpixbuf.h gdkpixmap.h gdkprivate.h gdkproperty.h gdkregion.h gdkrgb.h gdkscreen.h gdkselection.h gdktypes.h gdkvisual.h gdkwindow.h x11/gdkx.h"
-gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h"
-
-do_stage () {
-	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk
-	for i in ${gtk_include}; do
-		install -m 0644 gtk/$i ${STAGING_INCDIR}/gtk-2.0/gtk/$i
-	done
-
-	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk
-	for i in ${gdk_include}; do
-		install -m 0644 gdk/$i ${STAGING_INCDIR}/gtk-2.0/gdk/`basename $i`
-	done
-
-	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf
-	for i in ${gdk_pixbuf_include}; do
-		install -m 0644 gdk-pixbuf/$i ${STAGING_INCDIR}/gtk-2.0/gdk-pixbuf/$i
-	done
-
-	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/gtk-2.0
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	immodules_root = os.path.join(gtk_libdir, 'immodules')
-
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-}
diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
deleted file mode 100644
index 83f6be1982..0000000000
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
-set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
-HOMEPAGE = "http://www.gtk.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor"
-PR = "r7"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
-           file://no-demos.patch;patch=1 \
-           file://no-xwc.patch;patch=1;pnum=0 \
-           file://automake-lossage.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-	   file://spinbutton.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://gtk-doc.m4 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://single-click.patch;patch=1"
-
-inherit autotools pkgconfig flow-lossage
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-}
-
-FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
-	${bindir}/gtk-query-immodules-2.0 \
-	${libdir}/lib*.so.* \
-	${datadir}/themes ${sysconfdir}"
-FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
-
-RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
-
-EXTRA_OECONF = "--without-libtiff --disable-xkb"
-# --disable-cruft
-
-LIBV = "2.4.0"
-
-do_stage () {
-	oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/gtk-2.0
-}
-
-PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
-
-python populate_packages_prepend () {
-	import os.path
-
-	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
-	loaders_root = os.path.join(gtk_libdir, 'loaders')
-	immodules_root = os.path.join(gtk_libdir, 'immodules')
-
-	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
-
-        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
-}
diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
index 6b07f78074..1b009b5380 100644
--- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
+++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 DESCRIPTION = "Clearlooks theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 DEPENDS = "gtk+"
 PR = "r1"
 
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
index 68a5119aa1..d6e6de5037 100644
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
+++ b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 DEPENDS = "gtk+"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
diff --git a/packages/gtk-webcore/midori_0.0.12.bb b/packages/gtk-webcore/midori_0.0.12.bb
new file mode 100644
index 0000000000..23d0179375
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.12.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
diff --git a/packages/gtk-webcore/midori_0.0.13.bb b/packages/gtk-webcore/midori_0.0.13.bb
new file mode 100644
index 0000000000..23d0179375
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.13.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
diff --git a/packages/gtk-webcore/midori_0.0.15.bb b/packages/gtk-webcore/midori_0.0.15.bb
new file mode 100644
index 0000000000..23d0179375
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.15.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
diff --git a/packages/guile/guile-native_1.6.4.bb b/packages/guile/guile-native_1.6.4.bb
index 96763730ec..4a3bc5e74e 100644
--- a/packages/guile/guile-native_1.6.4.bb
+++ b/packages/guile/guile-native_1.6.4.bb
@@ -1,5 +1,6 @@
 SECTION = "unknown"
 LICENSE = "GPL"
+DEPENDS = "gmp-native"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
 	   file://guile-amd64.patch;patch=1"
 
diff --git a/packages/guile/guile-native_1.8.2.bb b/packages/guile/guile-native_1.8.2.bb
index 99d77b0da0..ac2b189d37 100644
--- a/packages/guile/guile-native_1.8.2.bb
+++ b/packages/guile/guile-native_1.8.2.bb
@@ -1,5 +1,6 @@
 SECTION = "unknown"
 LICENSE = "GPL"
+DEPENDS = "gmp-native"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            "
 
diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index 03c45623a4..6ece4ea310 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -1,6 +1,6 @@
 require hal.inc
 
-DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb"
+DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb"
 RDEPENDS += "udev hal-info"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb
new file mode 100644
index 0000000000..36760ec499
--- /dev/null
+++ b/packages/images/base-image.bb
@@ -0,0 +1,78 @@
+# This image is intended to provide a basic configuration that allows
+# you to access a newly flashed device over the network or via the
+# native console, and use ipkg to install (from feeds accessible via
+# the network) any further features you require into internal flash
+# memory or onto attached storage.
+
+# It should be as small as possible, while still achieving that goal.
+
+# The rationale for naming it 'base-image' is that this image is the
+# base upon which you can install any other functionality you desire.
+
+# See the end of this file for further rationale and policy regarding
+# the contents of this image, and the criteria which are used to make
+# decisions about adding and removing packages from this image.
+
+# Although it is only fully tested with the Angstrom distro, this
+# image is intended to be distro-agnostic.
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+DEPENDS = "\
+	task-boot \
+	task-distro-base task-machine-base \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	"
+
+IMAGE_INSTALL = "\
+	task-boot \
+	task-distro-base task-machine-base \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	"
+
+export IMAGE_BASENAME = "base-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
+# Key features of this image are:
+
+# 1) Must be able to mount attached storage devices like SD cards, CF
+# cards, internal disks, external USB disks, etc.  Should support
+# various filesystem choices, but ext2 at a minimum.  The rationale
+# for this is that you need storage to be able to install significant
+# new functionality.
+
+# 2) Must be able to boot from internal flash, or directly from a
+# filesystem stored on the attached storage.  The rationale for this
+# is that you will want to boot from attached storage instead of
+# messing around with ipkg-link.
+
+# Rationale and policy:
+
+# 'base-image' is the smallest possible image which allows you to ssh
+# into a device via it's native network interface, and install
+# packages from feeds across the network into internal flash or onto
+# an attached storage device.
+
+# It is "larger" than minimal-image (which is strictly only that which
+# is required to boot and get ssh access to the device, and nothing
+# else), but is "smaller" than console-image (which has a whole lot of
+# stuff in it which could easily be ipkg installed after boot rather
+# than being in the initial rootfs).
+
+# It is required to always be small enough to fit in the internal
+# flash rootfs partition of an NSLU2 (as an example of the smaller end
+# of flash sizes that OE supports), and features will be removed from
+# the image to ensure that this is always the case.  Any feature that
+# can be installed over the network using the package manager after
+# the first boot is always fair game for removal at any time, and
+# patches are welcome to make base-image as small as possible while
+# still retaining the ability to subsequently install that feature.
diff --git a/packages/images/console-mipv6-image.bb b/packages/images/console-mipv6-image.bb
new file mode 100644
index 0000000000..3c9995cf2e
--- /dev/null
+++ b/packages/images/console-mipv6-image.bb
@@ -0,0 +1,7 @@
+# This image is for testing the ipv6 mobility extensions
+
+require console-image.bb
+IMAGE_INSTALL += " task-mipl "
+
+export IMAGE_BASENAME = "console-mobile-ipv6-image"
+
diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb
index 6a3e60c5e3..cecd98d644 100644
--- a/packages/images/devimage-image.bb
+++ b/packages/images/devimage-image.bb
@@ -3,12 +3,8 @@
 # only shell and dropbear are loaded by default.
 # Allows to login via serial and real console or SSH
 
-DEVIMAGE_EXTRA_RDEPENDS ?= ""
-IMAGE_INSTALL = "devimage busybox dropbear udev \
-            module-init-tools pcmciautils \
-	    wireless-tools wpa-supplicant \
-	    irda-utils acx-firmware \
-	    ${DEVIMAGE_EXTRA_RDEPENDS}"
+DEPENDS = "task-devimage"
+IMAGE_INSTALL = "task-devimage"
 
 export IMAGE_BASENAME = "devimage"
 IMAGE_LINGUAS = ""
diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb
deleted file mode 100644
index 8b566af6ec..0000000000
--- a/packages/images/essential-image.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see COPYING.MIT)
-#
-# Filename: essential-image.bb
-# Date: 23-Apr-06
-
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-DEPENDS = "task-essential-to-boot"
-IMAGE_LINGUAS = ""
-IMAGE_INSTALL = "task-essential-to-boot"
-
-inherit image
-
diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb
deleted file mode 100644
index b74dec5e35..0000000000
--- a/packages/images/essential-machine-image.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see COPYING.MIT)
-#
-# Filename: essential-machine-image.bb
-# Date: 24-Apr-06
-
-DESCRIPTION = "<description>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-DEPENDS = "task-essential-to-boot task-essential-parts"
-
-MACHINE_TASKS_akita = "task-essential-to-boot \
-		       task-essential-pcmcia task-essential-userspace \
-		       task-essential-usbhost task-essential-usbclient \
-		       task-essential-sound task-essential-irda \
-		       task-essential-sd"
-
-IMAGE_LINGUAS = ""
-IMAGE_INSTALL = "${MACHINE_TASKS}"
-export IMAGE_BASENAME = "essential-image"
-
-inherit image
\ No newline at end of file
diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb
new file mode 100644
index 0000000000..a495363661
--- /dev/null
+++ b/packages/images/initramfs-bootmenu-image.bb
@@ -0,0 +1,11 @@
+# Sample initramfs image
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_LINGUAS = ""
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
+
+inherit image
diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb
new file mode 100644
index 0000000000..3f475567d2
--- /dev/null
+++ b/packages/images/minimal-gpe-image.bb
@@ -0,0 +1,24 @@
+#Angstrom minimal gpe image
+# This image provides a barebone dm and 'desktop' 
+# Very angstrom and ipkg centric
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "minimalist-gpe-image"
+
+PR = "r1"
+
+DEPENDS = "task-boot"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-boot \
+    gpe-dm gpe-session-scripts gpe-login \
+    matchbox-wm \
+    angstrom-feed-configs \
+    ipkg \
+    "
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/images/minimal-openmoko-image.bb b/packages/images/minimal-openmoko-image.bb
new file mode 100644
index 0000000000..6ab4935c24
--- /dev/null
+++ b/packages/images/minimal-openmoko-image.bb
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# Minimal OpenMoko Image Recipe
+# This should only have the base system + dialer
+# #------------------------------------------------------
+
+IMAGE_LINGUAS = ""
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+IMAGE_INSTALL = "\
+  task-base \
+  ${ANGSTROM_EXTRA_INSTALL} \
+  task-openmoko-linux \
+  task-openmoko-net \
+  task-openmoko-ui \
+  task-openmoko-base \
+  task-openmoko-phone \
+  "
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
diff --git a/packages/images/nslu2-base-image.bb b/packages/images/nslu2-base-image.bb
new file mode 100644
index 0000000000..444e9f6a49
--- /dev/null
+++ b/packages/images/nslu2-base-image.bb
@@ -0,0 +1,14 @@
+# Note that this package is intended to create an *identical*
+# kernel and rootfs as the normal base-image.bb
+
+# The only reason for the existence of this .bb file is to
+# create the 8MB and 16MB flashable NSLU2 firmware images.
+
+# Please do not add anything other than the following two
+# lines to this file, and please do not do anything in
+# the nslu2-image class which might affect the kernel
+# or rootfs.
+
+require base-image.bb
+
+inherit nslu2-image
diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb
deleted file mode 100644
index db2312c613..0000000000
--- a/packages/images/nslu2-minimal-image.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require minimal-image.bb
-
-INHERIT += nslu2-image
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index b4913097be..27dc165800 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -8,7 +8,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \
 	mtd-utils \
 	nano ncurses netbase \
 	openssh sysvinit \
-	timezones tinylogin udev"
+	tzdata tinylogin udev"
 
 DEPENDS += "virtual/kernel less nano"
 IMAGE_INSTALL = "kernel less nano elvis-tiny \
diff --git a/packages/images/x11-sato-image.bb b/packages/images/x11-sato-image.bb
new file mode 100644
index 0000000000..1204f22496
--- /dev/null
+++ b/packages/images/x11-sato-image.bb
@@ -0,0 +1,29 @@
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+IMAGE_INSTALL = "\
+	task-base-extended \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	pointercal \
+	matchbox-wm \
+	matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \
+	matchbox-desktop \
+	${XSERVER} \
+	xserver-kdrive-common xserver-nodm-init \
+	ttf-liberation \
+	xauth xhost xset xrandr \
+	matchbox-sato \
+	matchbox-config-gtk \
+	matchbox-themes-gtk \
+	matchbox-applet-startup-monitor \
+	xcursor-transparent-theme \
+	sato-icon-theme \
+	settings-daemon \
+"
+
+export IMAGE_BASENAME = "${PN}"
+IMAGE_LINGUAS = ""
+
+inherit image
+
diff --git a/packages/initrdscripts/devimage_0.1.bb b/packages/initrdscripts/devimage_0.1.bb
index 8eb6fa2d83..08949b9515 100644
--- a/packages/initrdscripts/devimage_0.1.bb
+++ b/packages/initrdscripts/devimage_0.1.bb
@@ -1,5 +1,6 @@
+DESCRIPTION = "Set of files to initialize bare system suitable for kernel, etc. testing."
 SRC_URI = "file://devimage.sh file://passwd file://dropbear_rsa_host_key"
-PR = "r1"
+PR = "r2"
 
 do_install() {
         install -m 0755 ${WORKDIR}/devimage.sh ${D}/init
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 002acff0a9..e90247c522 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,7 +1,9 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r3"
-RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
+PR = "r4"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
+RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop"
+# For VFAT mounting.
+RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
 
 do_install() {
 	install -d ${D}/initrd.d
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index b63bc67af7..23d73ebae6 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,14 +1,14 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r14"
+PR = "r15"
 
 inherit native
 
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils"
-INSTALL += "arfile.py"
+INSTALL += "ipkg-list-fields arfile.py"
 
 do_stage() {
         for i in ${INSTALL}; do
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 51f5d7f835..c089796ccb 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,19 +5,18 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
            file://ipkg-py-sane-vercompare.patch;patch=1 \
            file://ipkg-py-tarfile.patch;patch=1 \
            file://ipkg-make-index-track-stamps.patch;patch=1 \
-	   file://fields_tweaks.patch;patch=1 \
-	   "
+           file://fields_tweaks.patch;patch=1 "
 
 S = "${WORKDIR}/ipkg-utils"
 
-INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py"
+INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields"
 
 do_compile() {
 	oe_runmake ipkg-compare-versions
diff --git a/packages/ipkg/files/ipkg-configure b/packages/ipkg/files/ipkg-configure
new file mode 100644
index 0000000000..e0c65ad4e2
--- /dev/null
+++ b/packages/ipkg/files/ipkg-configure
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting to configure packages..."
+ipkg-cl configure
+echo "Finished to configure packages."
diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch
new file mode 100644
index 0000000000..51eccbb2bd
--- /dev/null
+++ b/packages/ipkg/files/ipkg_bugfix.patch
@@ -0,0 +1,44 @@
+Index: C/ipkg_conf.c
+===================================================================
+--- C.orig/ipkg_conf.c	2005-06-21 13:59:32.000000000 +0000
++++ C/ipkg_conf.c	2007-11-27 01:11:17.000000000 +0000
+@@ -423,6 +423,7 @@
+      nv_pair_t *nv_pair;
+      pkg_dest_t *dest;
+      char *root_dir;
++     char *list_dir2;
+ 
+      for (iter = nv_pair_list->head; iter; iter = iter->next) {
+ 	  nv_pair = iter->data;
+@@ -432,8 +433,14 @@
+ 	  } else {
+ 	       root_dir = strdup(nv_pair->value);
+ 	  }
+-	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
++	  if (conf->offline_root) {
++	       sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir);
++	  } else {
++	       list_dir2 = strdup(lists_dir);
++	  }
++	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2);
+ 	  free(root_dir);
++	  free(list_dir2);
+ 	  if (dest == NULL) {
+ 	       continue;
+ 	  }
+@@ -562,13 +569,13 @@
+ 	  } else if (strcmp(type, "dest") == 0) {
+ 	       nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
+ 	  } else if (strcmp(type, "lists_dir") == 0) {
+-	       *lists_dir = realloc(*lists_dir,strlen(value)+1);
++	       *lists_dir = realloc(*lists_dir,strlen(name)+1);
+                if (*lists_dir == NULL) {
+ 		    ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n");
+ 	            free(options);
+ 	            return EINVAL;
+                }
+-               sprintf (*lists_dir,"%s",value);
++               sprintf (*lists_dir,"%s", name);
+ 	  } else if (strcmp(type, "arch") == 0) {
+ 	       ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value);
+ 	       if (!value) {
diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb
index 13609c9037..7a95b28159 100644
--- a/packages/ipkg/ipkg-native_0.99.163.bb
+++ b/packages/ipkg/ipkg-native_0.99.163.bb
@@ -2,7 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}"
 
 #require ipkg_${PV}.bb
 require ipkg-native.inc
-PR = "r2"
+PR = "r4"
 
 inherit autotools pkgconfig native
 
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
index b1e2f19267..9154572f08 100644
--- a/packages/ipkg/ipkg.inc
+++ b/packages/ipkg/ipkg.inc
@@ -10,28 +10,24 @@ FILES_libipkg = "${libdir}/*.so.*"
 AUTO_LIBNAME_PKGS = "libipkg"
 
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+        file://ipkg-configure \
 	file://terse.patch;patch=1"
 
 S = "${WORKDIR}/ipkg/C"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
 
 # Define a variable to allow distros to run configure earlier.
 # (for example, to enable loading of ethernet kernel modules before networking starts)
 IPKG_INIT_POSITION = "98"
 IPKG_INIT_POSITION_slugos = "41"
 
+INITSCRIPT_NAME = "ipkg-configure"
+INITSCRIPT_PARAMS = "start ${IPKG_INIT_POSITION} S ."
+
+
 pkg_postinst_ipkg () {
 #!/bin/sh
-if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
-	# this happens at S98 where our good 'ole packages script used to run
-	echo "#!/bin/sh
-ipkg-cl configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-fi
-
 update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
@@ -40,6 +36,11 @@ pkg_postrm_ipkg () {
 update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
 do_stage() {
 	oe_libinstall -so libipkg ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/replace/
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
index 56e25900c1..fccfe8d53f 100644
--- a/packages/ipkg/ipkg_0.99.163.bb
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -1,9 +1,10 @@
 include ipkg.inc
-PR = "r5"
+PR = "r6"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
 SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+	file://ipkg-configure \
 	file://terse.patch;patch=1 \
 	file://is-processing.patch;patch=1 \
 	file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty b/packages/keymap-locales/files/qemux86/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty
+++ b/packages/keymap-locales/files/qemux86/.mtn2git_empty
diff --git a/packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map b/packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map
new file mode 100644
index 0000000000..58ade428b0
--- /dev/null
+++ b/packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map
@@ -0,0 +1,109 @@
+# French keymapping
+
+# azerty-layout
+keycode 16 = a
+keycode 17 = z
+keycode 18 = e
+keycode 19 = r
+keycode 20 = t
+keycode 21 = y
+keycode 22 = u
+keycode 23 = i
+keycode 24 = o
+keycode 25 = p
+#
+keycode 30 = q
+keycode 31 = s
+keycode 32 = d
+keycode 33 = f
+keycode 34 = g
+keycode 35 = h
+keycode 36 = j
+keycode 37 = k
+keycode 38 = l
+keycode 39 = m
+#
+keycode 44 = w
+keycode 45 = x
+keycode 46 = c
+keycode 47 = v
+keycode 48 = b
+keycode 49 = n
+#
+
+strings as usual
+
+keycode   1 = Escape           Escape          
+	alt     keycode   1 = Meta_Escape     
+keycode   2 = ampersand        one             
+	alt     keycode   2 = Meta_one        
+keycode   3 = braceleft        two              asciitilde      
+	control keycode   3 = nul             
+	alt     keycode   3 = Meta_two        
+keycode   4 = quotedbl         three            numbersign      
+	control keycode   4 = Escape          
+	alt     keycode   4 = Meta_three      
+keycode   5 = apostrophe       four             braceleft       
+	control keycode   5 = Control_backslash
+	alt     keycode   5 = Meta_four       
+keycode   6 = parenleft        five             bracketleft     
+	control keycode   6 = Control_bracketright
+	alt     keycode   6 = Meta_five       
+keycode   7 = minus            six              bar             
+	control keycode   7 = Control_asciicircum
+	alt     keycode   7 = Meta_six        
+keycode   8 = braceright       seven            grave           
+	control keycode   8 = Control_underscore
+	alt     keycode   8 = Meta_seven      
+keycode   9 = underscore       eight            backslash       
+	control keycode   9 = Delete          
+	alt     keycode   9 = Meta_eight      
+keycode  10 = slash            nine             asciicircum     
+	alt     keycode  10 = Meta_nine       
+keycode  11 = at               zero             at              
+	alt     keycode  11 = Meta_zero       
+keycode  12 = parenright       bracketright     bracketright    
+	control keycode  12 = Control_underscore
+	alt     keycode  12 = Meta_minus      
+keycode  13 = equal            plus             braceright      
+	alt     keycode  13 = Meta_equal      
+keycode  14 = Delete           Delete          
+	alt     keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+	alt     keycode  15 = Meta_Tab        
+keycode  26 = asciicircum      less            
+	control keycode  26 = Escape          
+	alt     keycode  26 = Meta_bracketleft
+keycode  27 = dollar           greater          asciitilde      
+	control keycode  27 = Control_bracketright
+	alt     keycode  27 = Meta_bracketright
+keycode  28 = Return          
+	alt     keycode  28 = Meta_Control_m          
+keycode  29 = Control         
+keycode  40 = bar              percent         
+	control keycode  40 = Control_g       
+	alt     keycode  40 = Meta_apostrophe 
+keycode  41 = asterisk         asciitilde      
+	control keycode  41 = nul             
+	alt     keycode  41 = Meta_grave      
+keycode  42 = Shift           
+keycode  43 = asterisk         numbersign      
+	control keycode  43 = Control_backslash
+	alt     keycode  43 = Meta_backslash  
+keycode  50 = comma            question      
+keycode  51 = semicolon        period          
+	alt     keycode  51 = Meta_comma      
+keycode  52 = colon            slash           
+	alt     keycode  52 = Meta_period     
+keycode  53 = exclam           backslash       
+	control keycode  53 = Delete          
+	alt     keycode  53 = Meta_slash      
+keycode  54 = Shift           
+keycode  56 = Alt             
+keycode  57 = space            space           
+	control keycode  57 = nul             
+	alt     keycode  57 = Meta_space      
+keycode  58 = Caps_Lock       
+keycode  86 = less             greater          bar             
+	alt     keycode  86 = Meta_less       
+keycode  97 = Control         
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index 8303672240..877b801f4c 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "file://*.map"
 
@@ -13,6 +13,7 @@ PACKAGES_akita = "keymap-extension-de keymap-extension-fi"
 PACKAGES_spitz = "keymap-extension-de keymap-extension-fi"
 PACKAGES_c7x0 = "keymap-extension-de keymap-extension-fi"
 PACKAGES_collie = "keymap-extension-de keymap-extension-fi"
+PACKAGES_qemux86 = "keymap-extension-fr"
 
 FILES_keymap-extension-de = "/etc/*-de.map"
 FILES_keymap-extension-fr = "/etc/*-fr.map"
diff --git a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty b/packages/keymaps/files/qemux86/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty
+++ b/packages/keymaps/files/qemux86/.mtn2git_empty
diff --git a/packages/keymaps/files/qemux86/keymap-2.6.map b/packages/keymaps/files/qemux86/keymap-2.6.map
new file mode 100644
index 0000000000..2389607160
--- /dev/null
+++ b/packages/keymaps/files/qemux86/keymap-2.6.map
@@ -0,0 +1,186 @@
+# Linux-specific (and language-independent) keys
+#
+# This file describes function keys, console switching keys,
+# keypad, cursor keys, and SysRq, ScrollLock, Pause
+#
+# It does not use the AltGr modifier, so that the user can opt
+# to have both Alt keys produce the same effect.
+# As a consequence, the Hex_* keys are missing, as are
+#	control altgr keycode 83 = Boot
+#	control altgr keycode 111 = Boot
+#
+# One culture-specific item that will be overridden in many keymaps
+# is the KP_Period: many countries have a KP_Comma instead.
+#
+# One user-preference item will be the function of the Delete key.
+#
+# Old keyboards have 10 function keys, and keymaps have
+# sometimes used shift+F1 = F11, and sometimes shift+F1 = F13.
+# Here we assume an enhanced keyboard (with 12 function keys).
+#
+plain keycode  59 = F1
+plain keycode  60 = F2
+plain keycode  61 = F3
+plain keycode  62 = F4
+plain keycode  63 = F5
+plain keycode  64 = F6
+plain keycode  65 = F7
+plain keycode  66 = F8
+plain keycode  67 = F9
+plain keycode  68 = F10
+plain keycode  87 = F11
+plain keycode  88 = F12
+shift keycode  59 = F13
+shift keycode  60 = F14
+shift keycode  61 = F15
+shift keycode  62 = F16
+shift keycode  63 = F17
+shift keycode  64 = F18
+shift keycode  65 = F19
+shift keycode  66 = F20
+shift keycode  67 = F21
+shift keycode  68 = F22
+shift keycode  87 = F23
+shift keycode  88 = F24
+control keycode  59 = F25
+control keycode  60 = F26
+control keycode  61 = F27
+control keycode  62 = F28
+control keycode  63 = F29
+control keycode  64 = F30
+control keycode  65 = F31
+control keycode  66 = F32
+control keycode  67 = F33
+control keycode  68 = F34
+control keycode  87 = F35
+control keycode  88 = F36
+#
+# The canonical assignment for F37-F48 uses
+#	control shift keycode  59 = F37
+# etc. If you want that, load linux-keys-extd.inc
+#
+# Both Alt+Fn and Control+Alt+Fn switch to Console n
+# (in order to please Linux / dosemu / X).
+# Here Consoles 1..12. For 13..24 load linux-keys-extd.inc
+#
+alt keycode  59 = Console_1
+alt keycode  60 = Console_2
+alt keycode  61 = Console_3
+alt keycode  62 = Console_4
+alt keycode  63 = Console_5
+alt keycode  64 = Console_6
+alt keycode  65 = Console_7
+alt keycode  66 = Console_8
+alt keycode  67 = Console_9
+alt keycode  68 = Console_10
+alt keycode  87 = Console_11
+alt keycode  88 = Console_12
+control alt keycode  59 = Console_1
+control alt keycode  60 = Console_2
+control alt keycode  61 = Console_3
+control alt keycode  62 = Console_4
+control alt keycode  63 = Console_5
+control alt keycode  64 = Console_6
+control alt keycode  65 = Console_7
+control alt keycode  66 = Console_8
+control alt keycode  67 = Console_9
+control alt keycode  68 = Console_10
+control alt keycode  87 = Console_11
+control alt keycode  88 = Console_12
+
+#
+# Keypad keys
+#
+keycode  69 = Num_Lock
+keycode  98 = KP_Divide
+keycode  55 = KP_Multiply
+keycode  74 = KP_Subtract
+keycode  78 = KP_Add
+keycode  96 = KP_Enter
+#
+keycode  71 = KP_7
+keycode  72 = KP_8
+keycode  73 = KP_9
+keycode  75 = KP_4
+keycode  76 = KP_5
+keycode  77 = KP_6
+keycode  79 = KP_1
+keycode  80 = KP_2
+keycode  81 = KP_3
+keycode  82 = KP_0
+#
+keycode  83 = KP_Period			# or KP_Comma
+control alt keycode  83 = Boot
+#
+alt keycode  71 = Ascii_7
+alt keycode  72 = Ascii_8
+alt keycode  73 = Ascii_9
+alt keycode  75 = Ascii_4
+alt keycode  76 = Ascii_5
+alt keycode  77 = Ascii_6
+alt keycode  79 = Ascii_1
+alt keycode  80 = Ascii_2
+alt keycode  81 = Ascii_3
+alt keycode  82 = Ascii_0
+#
+# The four cursor keys
+#
+keycode 103 = Up
+keycode 105 = Left
+keycode 106 = Right
+keycode 108 = Down
+alt keycode 103 = KeyboardSignal
+alt keycode 105 = Decr_Console
+alt keycode 106 = Incr_Console
+#
+# The six edit keys
+#
+keycode 110 = Insert
+keycode 102 = Home		# Find
+keycode 104 = PageUp		# Prior
+keycode 111 = Remove
+keycode 107 = End		# Select
+keycode 109 = PageDown		# Next
+shift keycode 104 = Scroll_Backward
+shift keycode 109 = Scroll_Forward
+control	alt keycode 111 = Boot
+#
+# The three system keys
+#
+keycode  84 = Last_Console		# Alt+SysRq/PrintScrn
+keycode  99 = Control_backslash		# SysRq/PrintScrn
+
+plain   keycode 70 = Scroll_Lock
+shift	keycode 70 = Show_Memory
+control keycode 70 = Show_State
+alt	keycode 70 = Show_Registers
+
+keycode 101 = Break			# Ctrl+Break/Pause
+keycode 119 = Pause			# Break/Pause
+
+keycode 100 = AltGr
+
+altgr keycode 70 = Show_Registers
+alt keycode 70 = Scroll_Lock
+
+control altgr keycode 83 = Boot
+control altgr keycode 111 = Boot
+
+# Hex keypad keys (for giving a Unicode value in 4 hex digits)
+# Follow lt.map and assign Hex_A .. Hex_F to keypad border.
+altgr keycode  55 = Hex_C
+altgr keycode  69 = Hex_A
+altgr keycode  71 = Hex_7
+altgr keycode  72 = Hex_8
+altgr keycode  73 = Hex_9
+altgr keycode  74 = Hex_D
+altgr keycode  75 = Hex_4
+altgr keycode  76 = Hex_5
+altgr keycode  77 = Hex_6
+altgr keycode  78 = Hex_E
+altgr keycode  79 = Hex_1
+altgr keycode  80 = Hex_2
+altgr keycode  81 = Hex_3
+altgr keycode  82 = Hex_0
+altgr keycode  96 = Hex_F
+altgr keycode  98 = Hex_B
diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb
index 813ba41011..00a215f948 100644
--- a/packages/keymaps/keymaps_1.0.bb
+++ b/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 RDEPENDS = "initscripts console-tools"
 LICENSE = "GPL"
 PACKAGE_ARCH = "${MACHINE}"
-PR = "r15"
+PR = "r16"
 
 inherit update-rc.d
 
@@ -18,6 +18,7 @@ SRC_URI_append_poodle       = " file://keymap-*.map"
 SRC_URI_append_jornada6xx   = " file://keymap-*.map"
 SRC_URI_append_h2200        = " file://keymap-*.map"
 SRC_URI_append_htcuniversal = " file://keymap-*.map"
+SRC_URI_append_qemux86      = " file://keymap-*.map"
 
 INITSCRIPT_NAME = "keymap"
 INITSCRIPT_PARAMS = "start 01 S ."
@@ -27,7 +28,7 @@ do_install () {
     install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal )
+        c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal | qemux86 )
             install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
             ;;
         *)
diff --git a/packages/libogg/libogg_1.1.3.bb b/packages/libogg/libogg_1.1.3.bb
new file mode 100644
index 0000000000..0a6e827ff1
--- /dev/null
+++ b/packages/libogg/libogg_1.1.3.bb
@@ -0,0 +1,17 @@
+SECTION = "libs"
+DESCRIPTION = "libogg is the bitstream and framing library \
+for the Ogg project. It provides functions which are \
+necessary to codec libraries like libvorbis."
+LICENSE = "BSD"
+
+SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/ogg
+	(cd ${S}/include/ogg; cp config_types.h ogg.h os_types.h ${STAGING_INCDIR}/ogg/)
+	install -m 0644 ${S}/ogg.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/libsndfile/libsndfile1_1.0.17.bb b/packages/libsndfile/libsndfile1_1.0.17.bb
index cf3b6d8e48..b15f84f94f 100644
--- a/packages/libsndfile/libsndfile1_1.0.17.bb
+++ b/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -3,13 +3,19 @@ HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
 AUTHOR = "Erik de Castro Lopo"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz"
 S = "${WORKDIR}/libsndfile-${PV}"
 
 inherit autotools lib_package pkgconfig
 
+do_configure_prepend_arm() {
+	export ac_cv_sys_largefile_source=1
+	export ac_cv_sys_file_offset_bits=64
+	ac_cv_sizeof_off_t=8
+}
+
 do_stage() {
 	oe_libinstall -a -so -C src libsndfile ${STAGING_LIBDIR}
 	install -m 0644 ${S}/src/sndfile.h ${STAGING_INCDIR}/
diff --git a/packages/libtool/libtool-1.5.10/libdir-la2.patch b/packages/libtool/libtool-1.5.10/libdir-la2.patch
new file mode 100644
index 0000000000..0d5d261203
--- /dev/null
+++ b/packages/libtool/libtool-1.5.10/libdir-la2.patch
@@ -0,0 +1,64 @@
+OE changes to installed=no which means we can't run the original test
+and just look in $objdir. We therefore look in both, preferring 
+$objdir if it exists - RP 29/11/2007
+
+--- libtool-1.5.10/ltmain.in.orig
++++ libtool-1.5.10/ltmain.in
+@@ -3105,8 +3105,11 @@
+ 		  fi
+ 		  ;;
+ 		esac
+-		if grep "^installed=no" $deplib > /dev/null; then
+-		  path="$absdir/$objdir"
++#		OE changes to installed=no which means we can't run the original test
++#		and just look in $objdir. We therefore look in both, preferring 
++#		$objdir if it exists, see below. - RP 29/11/2007
++#		if grep "^installed=no" $deplib > /dev/null; then
++#		  path="$absdir/$objdir"
+ #		This interferes with crosscompilation. -CL
+ #		else
+ #		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -3117,7 +3120,7 @@
+ #		  if test "$absdir" != "$libdir"; then
+ #		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ #		  fi
+-		else
++		if ! grep "^installed=no" $deplib > /dev/null; then
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+@@ -3138,9 +3141,17 @@
+ 		    for tmp in $deplibrary_names ; do
+ 		      depdepl=$tmp
+ 		    done
+-		    if test -f "$path/$depdepl" ; then
+-		      depdepl="$path/$depdepl"
++
++		    if test -f "$absdir/$objdir/$depdepl" ; then
++		      depdepl="$absdir/$objdir/$depdepl"
++		      path="$absdir/$objdir"
++		    elif test -f "$absdir/$depdepl" ; then
++		      depdepl="$absdir/$depdepl"
++		      path="$absdir"
++		    else
++		      path="$absdir/$objdir"
+ 		    fi
++		    
+ 		    # do not add paths which are already there
+ 		    case " $newlib_search_path " in
+ 		    *" $path "*) ;;
+@@ -3150,7 +3161,13 @@
+ 		  path=""
+ 		  ;;
+ 		*)
+-		  path="-L$path"
++		  if test -d "$absdir/$objdir" ; then
++		    path="-L$absdir/$objdir"
++		  elif test -d "$absdir" ; then
++		    path="-L$absdir"
++		  else
++		    path="-L$absdir/$objdir"
++		  fi
+ 		  ;;
+ 		esac
+ 		;;
diff --git a/packages/libtool/libtool-1.5.10/nmedit_fix.patch b/packages/libtool/libtool-1.5.10/nmedit_fix.patch
new file mode 100644
index 0000000000..673f3a9a28
--- /dev/null
+++ b/packages/libtool/libtool-1.5.10/nmedit_fix.patch
@@ -0,0 +1,56 @@
+Fix so instead of calling "nmedit" it gets prefixed with the host triplet.
+
+RP - 30/11/2007
+
+Index: libtool-1.5.10/libtool.m4
+===================================================================
+--- libtool-1.5.10.orig/libtool.m4	2007-11-29 19:27:31.000000000 +0000
++++ libtool-1.5.10/libtool.m4	2007-11-29 19:29:09.000000000 +0000
+@@ -2927,11 +2927,11 @@
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+         # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+           if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           else
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           fi
+-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       else
+       case "$cc_basename" in
+         xlc*)
+@@ -2939,8 +2939,8 @@
+           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+          _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -5474,8 +5474,8 @@
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+       case "$cc_basename" in
+         xlc*)
+@@ -5483,8 +5483,8 @@
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+          _LT_AC_TAGVAR(ld_shlibs, $1)=no
diff --git a/packages/libtool/libtool-1.5.10/nousrlib.patch b/packages/libtool/libtool-1.5.10/nousrlib.patch
new file mode 100644
index 0000000000..e97b45578d
--- /dev/null
+++ b/packages/libtool/libtool-1.5.10/nousrlib.patch
@@ -0,0 +1,11 @@
+--- libtool-1.5.10.orig/ltmain.in
++++ libtool-1.5.10/ltmain.in
+@@ -2637,8 +2637,6 @@
+ 	        add="$libdir/$linklib"
+ 	      fi
+ 	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
diff --git a/packages/libtool/libtool-1.5.10/tag1.patch b/packages/libtool/libtool-1.5.10/tag1.patch
deleted file mode 100644
index 6fefd6266d..0000000000
--- a/packages/libtool/libtool-1.5.10/tag1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libtool-1.5.10/libltdl/ltmain.sh
-===================================================================
---- libtool-1.5.10.orig/libltdl/ltmain.sh	2004-09-19 13:34:44.000000000 +0100
-+++ libtool-1.5.10/libltdl/ltmain.sh	2006-05-25 15:28:39.000000000 +0100
-@@ -232,7 +232,7 @@
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
- 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
-+#	  exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index 4c1b7c2e1f..5f15c56a97 100644
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,14 +1,17 @@
 SECTION = "devel"
 require libtool_${PV}.bb
 
-PR = "r6"
+PR = "r9"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
+                   file://libdir-la2.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
-                   file://tag1.patch;patch=1 \
-                   file://install-path-check.patch;patch=1"
+                   file://install-path-check.patch;patch=1 \
+		   file://nmedit_fix.patch;patch=1 \
+		   file://nousrlib.patch;patch=1"
+
 S = "${WORKDIR}/libtool-${PV}"
 
 prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
@@ -16,7 +19,13 @@ exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
-	:
+	rm -f ltmain.shT
+	date=`/bin/sh ./mkstamp < ./ChangeLog` && \
+        sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \
+            -e "s%@""TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT
+	mv -f ltmain.shT ltmain.sh || \
+	        (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
+	cp ltmain.sh ./libltdl/
 }
 
 do_stage () {
diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb
index 2780ef64ff..e21a20b85d 100644
--- a/packages/libtool/libtool-native_1.5.10.bb
+++ b/packages/libtool/libtool-native_1.5.10.bb
@@ -1,14 +1,16 @@
 SECTION = "devel"
 require libtool_${PV}.bb
 
-PR = "r6"
+PR = "r9"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
+                   file://libdir-la2.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \
-                   file://tag1.patch;patch=1 \
                    file://install-path-check.patch;patch=1 \
+		   file://nousrlib.patch;patch=1 \
 		   file://rpath-control.patch;patch=1"
+
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit native
diff --git a/packages/libtool/libtool_1.5.10.bb b/packages/libtool/libtool_1.5.10.bb
index 20929a7fa2..35cebfa5c2 100644
--- a/packages/libtool/libtool_1.5.10.bb
+++ b/packages/libtool/libtool_1.5.10.bb
@@ -5,7 +5,7 @@ libraries) behind a consistent interface."
 HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPL"
 SECTION = "devel"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
@@ -13,10 +13,11 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
 	   file://3figures.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-PACKAGES = "libltdl libltdl-dev ${PN}"
+PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
 FILES_${PN} += "${datadir}/aclocal*"
 FILES_libltdl = "${libdir}/libltdl.so.*"
 FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
+FILES_libltdl-dbg = "${libdir}/.debug/"
 
 inherit autotools
 
diff --git a/packages/libungif/libungif_4.1.3.bb b/packages/libungif/libungif_4.1.3.bb
index bd7a2fd8cb..caf0427551 100644
--- a/packages/libungif/libungif_4.1.3.bb
+++ b/packages/libungif/libungif_4.1.3.bb
@@ -1,6 +1,6 @@
 SECTION = "libs"
 DESCRIPTION = "shared library for GIF images"
-SRC_URI = "${SOURCEFORGE_MIRROR}/libungif/libungif-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
 LICENSE = "MIT"
 PR = "r1"
 
diff --git a/packages/libvorbis/libvorbis_1.2.0.bb b/packages/libvorbis/libvorbis_1.2.0.bb
new file mode 100644
index 0000000000..79b79e8f49
--- /dev/null
+++ b/packages/libvorbis/libvorbis_1.2.0.bb
@@ -0,0 +1,30 @@
+SECTION = "libs"
+DEPENDS = "libogg"
+DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
+that is free of intellectual property restrictions. libvorbis \
+is the main vorbis codec library."
+LICENSE = "BSD"
+
+SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz"
+
+inherit autotools  pkgconfig
+
+# vorbisfile.c reveals a problem in the gcc register spilling for the
+# thumb instruction set...
+FULL_OPTIMIZATION_thumb = "-O0"
+
+EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
+	        --with-ogg-includes=${STAGING_INCDIR}"
+
+do_stage () {
+	oe_libinstall -a -so -C lib libvorbis ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C lib libvorbisfile ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C lib libvorbisenc ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/vorbis
+	install -m 0644 include/vorbis/vorbisenc.h \
+			include/vorbis/vorbisfile.h \
+			include/vorbis/codec.h ${STAGING_INCDIR}/vorbis/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 vorbis.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/libxml/files/no-testapi.patch b/packages/libxml/files/no-testapi.patch
deleted file mode 100644
index 15a4dea0ee..0000000000
--- a/packages/libxml/files/no-testapi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- /tmp/Makefile.am	2005-11-13 14:33:15.844432536 +0100
-+++ libxml2-2.6.22/Makefile.am	2005-11-13 14:33:25.796919528 +0100
-@@ -8,7 +8,7 @@
- 
- noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
-                 testThreads testC14N testAutomata testRegexp \
--                testReader testapi testModule runtest runsuite
-+                testReader testModule runtest runsuite
- 
- bin_PROGRAMS = xmllint xmlcatalog
- 
-@@ -135,20 +135,9 @@
- testdso_la_LDFLAGS = -module -rpath $(libdir)
- 
- # that one forces the rebuild when "make rebuild" is run on doc/
--rebuild_testapi:
--	-@(if [ "$(PYTHON)" != "" ] ; then \
--	    $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
- 
- # that one is just to make sure it is rebuilt if missing
- # but adding the dependances generate mess
--testapi.c:
--	-@(if [ "$(PYTHON)" != "" ] ; then \
--	    $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
--
--testapi_SOURCES=testapi.c
--testapi_LDFLAGS = 
--testapi_DEPENDENCIES = $(DEPS)
--testapi_LDADD= $(LDADDS)
- 
- #testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c
- #testOOM_LDFLAGS = 
-@@ -169,9 +158,6 @@
- 	@echo '## Go get a cup of coffee it is gonna take a while ...'
- 	$(MAKE) CHECKER='valgrind' tests
- 
--APItests: testapi$(EXEEXT)
--	@echo "## Running the API regression tests this may take a little while"
--	-@($(CHECKER) $(top_builddir)/testapi -q)
- 
- HTMLtests : testHTML$(EXEEXT)
- 	@(echo > .memdump)
-@@ -1116,7 +1102,7 @@
- dist-test: distdir
- 	(mkdir -p $(distdir))
- 	(cd $(srcdir) ; tar -cf - --exclude CVS xstc/Tests) | (cd $(distdir); tar xf -)
--	tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests  $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz
-+	tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests  $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz
- 	@(rm -rf $(distdir)/xstc/Test)
- 
- cleantar:
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index f65bf1459e..014fd23705 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
@@ -38,7 +38,7 @@ do_compile () {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=${ARCH}
 }
 
 do_install_append_arm() {
@@ -51,7 +51,7 @@ do_stage () {
 	set_arch
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
-	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=${ARCH}
 	if [ "${ARCH}" == "arm" ]; then
 		cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
 	fi
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 0b6112884e..8794b17d96 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_compile () {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
 	echo $ARCH
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
-	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
 	if [ "$ARCH" = "arm" ]; then
 		cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
 	fi
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
index 43a5cb9ef1..595edde810 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_compile () {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
 	echo $ARCH
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
-	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
 	if [ "$ARCH" = "arm" ]; then
 		cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
 	fi
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
index 43a5cb9ef1..595edde810 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_compile () {
 
 do_install() {
 	set_arch
-	oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
 	echo $ARCH
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
-	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
 	if [ "$ARCH" = "arm" ]; then
 		cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
 	fi
diff --git a/packages/linux/em-x270_2.6.23.bb b/packages/linux/em-x270_2.6.23.bb
index a9d6ee7905..fcef7280d0 100644
--- a/packages/linux/em-x270_2.6.23.bb
+++ b/packages/linux/em-x270_2.6.23.bb
@@ -3,8 +3,8 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab EM-X270 system"
 LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r0"
+DEPENDS = "u-boot-utils-native"
+PR = "r1"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty b/packages/linux/linux-2.6.23+2.6.24-rc5/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty b/packages/linux/linux-2.6.23+2.6.24-rc5/alix/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/alix/.mtn2git_empty
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/alix/defconfig b/packages/linux/linux-2.6.23+2.6.24-rc5/alix/defconfig
new file mode 100644
index 0000000000..c2750cc213
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/alix/defconfig
@@ -0,0 +1,1836 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24-rc5
+# Fri Dec 21 10:16:47 2007
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_MMU=y
+CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_DMI=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_SUPPORTS_OPROFILE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+CONFIG_BLK_DEV_BSG=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# Processor type and features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_SMP is not set
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_X86_VSMP is not set
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MGEODEGX1 is not set
+CONFIG_MGEODE_LX=y
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_GENERIC_CPU is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_XADD=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_USE_3DNOW=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
+# CONFIG_X86_UP_APIC is not set
+# CONFIG_X86_MCE is not set
+CONFIG_VM86=y
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+CONFIG_X86_REBOOTFIXUPS=y
+# CONFIG_MICROCODE is not set
+CONFIG_X86_MSR=m
+# CONFIG_X86_CPUID is not set
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+# CONFIG_X86_PAE is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_NR_QUICK=1
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_MTRR is not set
+# CONFIG_EFI is not set
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+# CONFIG_KEXEC is not set
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_COMPAT_VDSO is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+# CONFIG_SUSPEND is not set
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+# CONFIG_HIBERNATION is not set
+CONFIG_ACPI=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_PROC_EVENT is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+# CONFIG_ACPI_BUTTON is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_SYSTEM=y
+CONFIG_X86_PM_TIMER=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_LEGACY is not set
+# CONFIG_PCI_DEBUG is not set
+CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+CONFIG_GEODE_MFGPT_TIMER=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_RCSIMPLE=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ACPI is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+CONFIG_PATA_CS5536=y
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_IP1000 is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=y
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_RHINE_NAPI=y
+# CONFIG_SC92031 is not set
+# CONFIG_NET_POCKET is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+CONFIG_USB_ZD1201=m
+# CONFIG_RTL8187 is not set
+# CONFIG_ADM8211 is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_HOSTAP is not set
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DMA=y
+CONFIG_B43_PIO=y
+CONFIG_B43_DMA_AND_PIO_MODE=y
+# CONFIG_B43_DMA_MODE is not set
+# CONFIG_B43_PIO_MODE is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2400PCI=m
+# CONFIG_RT2400PCI_RFKILL is not set
+CONFIG_RT2500PCI=m
+# CONFIG_RT2500PCI_RFKILL is not set
+CONFIG_RT61PCI=m
+# CONFIG_RT61PCI_RFKILL is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+# CONFIG_RT2X00_DEBUG is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET=m
+# CONFIG_USB_NET_AX8817X is not set
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+# CONFIG_USB_BELKIN is not set
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+# CONFIG_INPUT_WISTRON_BTNS is not set
+# CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_UINPUT is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+CONFIG_HW_RANDOM_GEODE=y
+# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+# CONFIG_MWAVE is not set
+# CONFIG_PC8736x_GPIO is not set
+CONFIG_NSC_GPIO=m
+CONFIG_CS5535_GPIO=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+# CONFIG_HPET_RTC_IRQ is not set
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_SCx200_ACB=m
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_FSCHMD is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83627HF=m
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_ITCO_WDT is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_EFI is not set
+# CONFIG_FB_HECUBA is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_CYBLA is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=y
+# CONFIG_FB_GEODE_GX is not set
+# CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VIDEO_SELECT=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+CONFIG_SND_CS5535AUDIO=m
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_HIDRAW=y
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_PERSIST is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+# CONFIG_RTC_INTF_PROC is not set
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_VIRTUALIZATION is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+# CONFIG_DCDBAS is not set
+# CONFIG_DMIID is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=m
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BIND34=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+# CONFIG_NCP_FS is not set
+CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf-8"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+CONFIG_NLS_CODEPAGE_852=m
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+CONFIG_NLS_CODEPAGE_1250=m
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+CONFIG_INSTRUMENTATION=y
+# CONFIG_PROFILING is not set
+# CONFIG_KPROBES is not set
+# CONFIG_MARKERS is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DETECT_SOFTLOCKUP is not set
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_FRAME_POINTER is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_RODATA is not set
+CONFIG_4KSTACKS=y
+CONFIG_DOUBLEFAULT=y
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_LRW=m
+# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_TEST=m
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_PADLOCK is not set
+CONFIG_CRYPTO_DEV_GEODE=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/.mtn2git_empty
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch
new file mode 100644
index 0000000000..0124b75e4b
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch
@@ -0,0 +1,25 @@
+From 2a3b2dd055b235eb14f7654eeef217222cdb8e00 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 18:58:27 -0400
+Subject: [PATCH] cm-x270-match-type
+
+---
+ arch/arm/boot/compressed/head-xscale.S |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
+index 67ea99e..2e63ba2 100644
+--- a/arch/arm/boot/compressed/head-xscale.S
++++ b/arch/arm/boot/compressed/head-xscale.S
+@@ -44,3 +44,8 @@ __XScale_start:
+ 		str	r1, [r0, #0x18]
+ #endif
+ 
++#if defined(CONFIG_MACH_ARMCORE)
++		mov r7, #(MACH_TYPE_ARMCORE & 0xFF00)
++		add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF)
++#endif
++
+-- 
+1.5.2.5
+
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch
new file mode 100644
index 0000000000..74451c4454
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch
@@ -0,0 +1,81 @@
+From 7d874d6bb1c1210402938a21ab51a4b64e2d68e5 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:01:50 -0400
+Subject: [PATCH] ramdisk_load
+
+---
+ arch/arm/mach-pxa/cm-x270.c        |    6 ++++++
+ include/asm-arm/arch-pxa/cm-x270.h |    4 ++++
+ init/initramfs.c                   |   16 ++++++++++++++++
+ 3 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
+index 177664c..fb607e9 100644
+--- a/arch/arm/mach-pxa/cm-x270.c
++++ b/arch/arm/mach-pxa/cm-x270.c
+@@ -239,6 +239,12 @@ static struct map_desc cmx270_io_desc[] __initdata = {
+ 		.length		= SZ_64M,
+ 		.type		= MT_DEVICE
+ 	},
++	[2] = { /* NOR flash */
++		.virtual	= CMX270_FLASH_VIRT,
++		.pfn		= __phys_to_pfn(PXA_CS0_PHYS),
++		.length		= (8<<20), /* up to 8 MByte flash */
++		.type		= MT_DEVICE
++	},
+ };
+ 
+ /*
+diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h
+index f8fac9e..70e0dce 100644
+--- a/include/asm-arm/arch-pxa/cm-x270.h
++++ b/include/asm-arm/arch-pxa/cm-x270.h
+@@ -20,6 +20,10 @@
+ #define CMX270_VIRT_BASE		(0xe8000000)
+ #define CMX270_IT8152_VIRT		(CMX270_VIRT_BASE)
+ #define CMX270_IDE104_VIRT		(CMX270_IT8152_VIRT + SZ_64M)
++#define CMX270_FLASH_VIRT              (CMX270_IDE104_VIRT + SZ_64M)
++
++#define CMX270_FLASH_RAMDISK_VIRT      (CMX270_FLASH_VIRT + 0x1c0000)
++
+ 
+ /* GPIO related definitions */
+ #define GPIO_IT8152_IRQ			(22)
+diff --git a/init/initramfs.c b/init/initramfs.c
+index 1db02a0..d875fbc 100644
+--- a/init/initramfs.c
++++ b/init/initramfs.c
+@@ -7,6 +7,9 @@
+ #include <linux/string.h>
+ #include <linux/syscalls.h>
+ 
++// HACK for compulab cm-x270
++#include <asm/arch/cm-x270.h>
++
+ static __initdata char *message;
+ static void __init error(char *x)
+ {
+@@ -550,7 +553,20 @@ static int __init populate_rootfs(void)
+ #ifdef CONFIG_BLK_DEV_INITRD
+ 	if (initrd_start) {
+ #ifdef CONFIG_BLK_DEV_RAM
++ 
++		/* hack to make initramfs work because the 
++		 * compulab BL does not zero out the 
++		 * initrd memory.  This only seems to affect loading
++		 * initramfs (cpio.gz) archives.  Does not seem to 
++		 * affect ramdisks.
++		 */
++ 		int initrd_size = *(int *)(CMX270_FLASH_RAMDISK_VIRT);
+ 		int fd;
++
++ 		initrd_end = initrd_start + initrd_size;
++ 		//printk("CLIFF: initrd_start = 0x%x\n", initrd_start);
++ 		//printk("CLIFF: initrd_end = 0x%x\n", initrd_end);
++
+ 		printk(KERN_INFO "checking if image is initramfs...");
+ 		err = unpack_to_rootfs((char *)initrd_start,
+ 			initrd_end - initrd_start, 1);
+-- 
+1.5.2.5
+
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch
new file mode 100644
index 0000000000..1fe3eb5d0a
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch
@@ -0,0 +1,36 @@
+From caad105a5732f7ca8ea88d4448aa5d9f4d7eb2c4 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:02:55 -0400
+Subject: [PATCH] mmcsd_large_cards-r0
+
+---
+ drivers/mmc/card/block.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
+index aeb32a9..d854b0c 100644
+--- a/drivers/mmc/card/block.c
++++ b/drivers/mmc/card/block.c
+@@ -423,6 +423,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
+ {
+ 	struct mmc_blk_data *md;
+ 	int devidx, ret;
++	unsigned long cap;
+ 
+ 	devidx = find_first_zero_bit(dev_use, MMC_NUM_MINORS);
+ 	if (devidx >= MMC_NUM_MINORS)
+@@ -486,6 +487,11 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
+ 
+ 	sprintf(md->disk->disk_name, "mmcblk%d", devidx);
+ 
++	if (card->csd.read_blkbits > 9)
++		md->block_bits = 9;
++	else
++		md->block_bits = card->csd.read_blkbits;
++
+ 	blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits);
+ 
+ 	if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) {
+-- 
+1.5.2.5
+
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch
new file mode 100644
index 0000000000..f060a963a4
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch
@@ -0,0 +1,25 @@
+From deb5c78d6625c6fd5ce25ac3c8ac396e7e61ebf7 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:04:12 -0400
+Subject: [PATCH] cm-x270-nand-simplify-name
+
+---
+ drivers/mtd/nand/cmx270_nand.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
+index cb663ef..3654ce4 100644
+--- a/drivers/mtd/nand/cmx270_nand.c
++++ b/drivers/mtd/nand/cmx270_nand.c
+@@ -191,6 +191,8 @@ static int cmx270_init(void)
+ 	cmx270_nand_mtd->owner = THIS_MODULE;
+ 	cmx270_nand_mtd->priv = this;
+ 
++	cmx270_nand_mtd->name = "cm-x270-nand";
++
+ 	/* insert callbacks */
+ 	this->IO_ADDR_R = cmx270_nand_io;
+ 	this->IO_ADDR_W = cmx270_nand_io;
+-- 
+1.5.2.5
+
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch
new file mode 100644
index 0000000000..8a6b5dfc91
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch
@@ -0,0 +1,150 @@
+From 416e9cca1903f4a6f26c241c3393ad635015e7f6 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@happy.(none)>
+Date: Sat, 15 Dec 2007 12:24:05 -0500
+Subject: [PATCH] cmx270-pci
+
+---
+ arch/arm/Kconfig                |    8 +++++++-
+ arch/arm/common/it8152.c        |   10 ++--------
+ arch/arm/mach-pxa/cm-x270-pci.c |   18 ++++++++----------
+ 3 files changed, 17 insertions(+), 19 deletions(-)
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index a7e9fea..c4de2d4 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -537,7 +537,7 @@ config ISA_DMA_API
+ 	bool
+ 
+ config PCI
+-	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695
++	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE
+ 	help
+ 	  Find out whether you have a PCI motherboard. PCI is the name of a
+ 	  bus system, i.e. the way the CPU talks to the other stuff inside
+@@ -558,6 +558,12 @@ config PCI_HOST_VIA82C505
+ 	depends on PCI && ARCH_SHARK
+ 	default y
+ 
++config PCI_HOST_ITE8152
++	bool
++	depends on PCI && MACH_ARMCORE
++	default y
++	select DMABOUNCE
++
+ source "drivers/pci/Kconfig"
+ 
+ source "drivers/pcmcia/Kconfig"
+diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
+index c03de9b..97b7dc1 100644
+--- a/arch/arm/common/it8152.c
++++ b/arch/arm/common/it8152.c
+@@ -70,8 +70,6 @@ static inline void it8152_irq(int irq)
+ {
+ 	struct irq_desc *desc;
+ 
+-	printk(KERN_DEBUG "===> %s: irq=%d\n", __FUNCTION__, irq);
+-
+ 	desc = irq_desc + irq;
+ 	desc_handle_irq(irq, desc);
+ }
+@@ -106,8 +104,6 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
+        int bits_pd, bits_lp, bits_ld;
+        int i;
+ 
+-       printk(KERN_DEBUG "=> %s: irq = %d\n", __FUNCTION__, irq);
+-
+        while (1) {
+ 	       /* Read all */
+ 	       bits_pd = __raw_readl(IT8152_INTC_PDCNIRR);
+@@ -293,8 +289,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
+  */
+ int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
+ {
+-	printk(KERN_DEBUG "%s: %s %llx\n",
+-	       __FUNCTION__, dev->dev.bus_id, mask);
++	dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask);
+ 	if (mask >= PHYS_OFFSET + SZ_64M - 1)
+ 		return 0;
+ 
+@@ -304,8 +299,7 @@ int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
+ int
+ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
+ {
+-	printk(KERN_DEBUG "%s: %s %llx\n",
+-	       __FUNCTION__, dev->dev.bus_id, mask);
++	dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask);
+ 	if (mask >= PHYS_OFFSET + SZ_64M - 1)
+ 		return 0;
+ 
+diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
+index 878d3b9..15c4e0d 100644
+--- a/arch/arm/mach-pxa/cm-x270-pci.c
++++ b/arch/arm/mach-pxa/cm-x270-pci.c
+@@ -40,7 +40,7 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size,
+ {
+ 	unsigned int sz = SZ_64M >> PAGE_SHIFT;
+ 
+-	printk(KERN_INFO "Adjusting zones for CM-x270\n");
++	pr_info("Adjusting zones for CM-x270\n");
+ 
+ 	/*
+ 	 * Only adjust if > 64M on current system
+@@ -104,8 +104,7 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+ {
+ 	int irq;
+ 
+-	printk(KERN_DEBUG "===> %s: %s slot=%x, pin=%x\n", __FUNCTION__,
+-	       pci_name(dev), slot, pin);
++	dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __FUNCTION__, slot, pin);
+ 
+ 	irq = it8152_pci_map_irq(dev, slot, pin);
+ 	if (irq)
+@@ -141,14 +140,13 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+ 	return(0);
+ }
+ 
+-static struct pci_bus * __init
+-cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
++static void cmx270_pci_preinit(void)
+ {
+-	printk(KERN_INFO "Initializing CM-X270 PCI subsystem\n");
++	pr_info("Initializing CM-X270 PCI subsystem\n");
+ 
+ 	__raw_writel(0x800, IT8152_PCI_CFG_ADDR);
+ 	if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) {
+-		printk(KERN_INFO "PCI Bridge found.\n");
++		pr_info("PCI Bridge found.\n");
+ 
+ 		/* set PCI I/O base at 0 */
+ 		writel(0x848, IT8152_PCI_CFG_ADDR);
+@@ -163,7 +161,7 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
+ 		/* CardBus Controller on ATXbase baseboard */
+ 		writel(0x4000, IT8152_PCI_CFG_ADDR);
+ 		if (readl(IT8152_PCI_CFG_DATA) == 0xAC51104C) {
+-			printk(KERN_INFO "CardBus Bridge found.\n");
++			pr_info("CardBus Bridge found.\n");
+ 
+ 			/* Configure socket 0 */
+ 			writel(0x408C, IT8152_PCI_CFG_ADDR);
+@@ -196,7 +194,6 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
+ 			writel(0xb0000000, IT8152_PCI_CFG_DATA);
+ 		}
+ 	}
+-	return it8152_pci_scan_bus(nr, sys);
+ }
+ 
+ static struct hw_pci cmx270_pci __initdata = {
+@@ -204,7 +201,8 @@ static struct hw_pci cmx270_pci __initdata = {
+ 	.map_irq	= cmx270_pci_map_irq,
+ 	.nr_controllers	= 1,
+ 	.setup		= it8152_pci_setup,
+-	.scan		= cmx270_pci_scan_bus,
++	.scan		= it8152_pci_scan_bus,
++	.preinit	= cmx270_pci_preinit,
+ };
+ 
+ static int __init cmx270_init_pci(void)
+-- 
+1.5.2.5
+
diff --git a/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig
new file mode 100644
index 0000000000..57a98014b3
--- /dev/null
+++ b/packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig
@@ -0,0 +1,1258 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24-rc5
+# Tue Dec 18 12:02:51 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION="-cm-x270"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Intel PXA2xx/PXA3xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
+# CONFIG_MACH_EM_X270 is not set
+# CONFIG_MACH_ZYLONITE is not set
+CONFIG_MACH_ARMCORE=y
+CONFIG_PXA27x=y
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+CONFIG_IWMMXT=y
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+# CONFIG_PCI is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_PREEMPT=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_RCSIMPLE=y
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x400000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+CONFIG_MTD_NAND_CM_X270=y
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_SMC91X is not set
+CONFIG_DM9000=y
+# CONFIG_SMC911X is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_USB is not set
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_RT2X00 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_PXA27x is not set
+# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_UCB1400=m
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_PXA2XX_PCM=m
+CONFIG_SND_PXA2XX_AC97=m
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG=y
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+
+#
+# MMC/SD Host Controller Drivers
+#
+CONFIG_MMC_PXA=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_CM_X270=y
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGERS is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+CONFIG_INSTRUMENTATION=y
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_HW=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch b/packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch
new file mode 100644
index 0000000000..b377355815
--- /dev/null
+++ b/packages/linux/linux-2.6.23/leds-cpu-activity-powerpc.patch
@@ -0,0 +1,46 @@
+Index: linux-2.6.23/arch/powerpc/kernel/idle.c
+===================================================================
+--- linux-2.6.23.orig/arch/powerpc/kernel/idle.c	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/kernel/idle.c	2007-12-05 11:34:39.000000000 +0100
+@@ -19,6 +19,7 @@
+  * 2 of the License, or (at your option) any later version.
+  */
+ 
++#include <linux/leds.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/smp.h>
+@@ -50,6 +51,12 @@
+ __setup("powersave=off", powersave_off);
+ 
+ /*
++ * CPU activity indicator.
++ */
++void (*leds_idle)(int is_idle);
++EXPORT_SYMBOL(leds_idle);
++
++/*
+  * The body of the idle task.
+  */
+ void cpu_idle(void)
+@@ -59,6 +66,8 @@
+ 
+ 	set_thread_flag(TIF_POLLING_NRFLAG);
+ 	while (1) {
++ 		if (leds_idle)
++     	leds_idle(1);
+ 		while (!need_resched() && !cpu_should_die()) {
+ 			ppc64_runlatch_off();
+ 
+@@ -92,8 +101,11 @@
+ 		ppc64_runlatch_on();
+ 		if (cpu_should_die())
+ 			cpu_die();
++    if (leds_idle)
++			leds_idle(0);
+ 		preempt_enable_no_resched();
+ 		schedule();
++
+ 		preempt_disable();
+ 	}
+ }
diff --git a/packages/linux/linux-2.6.23/leds-cpu-activity.patch b/packages/linux/linux-2.6.23/leds-cpu-activity.patch
new file mode 100644
index 0000000000..ebdf1abd81
--- /dev/null
+++ b/packages/linux/linux-2.6.23/leds-cpu-activity.patch
@@ -0,0 +1,554 @@
+Index: linux-2.6.23/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.23.orig/drivers/leds/Kconfig	2007-12-05 12:00:28.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig	2007-12-05 13:46:39.000000000 +0100
+@@ -123,6 +123,15 @@
+ 	  This allows LEDs to be controlled by a programmable timer
+ 	  via sysfs. If unsure, say Y.
+ 
++config LEDS_TRIGGER_CPU_ACTIVITY
++	tristate "LED CPU Activity Trigger"
++	depends on LEDS_TRIGGERS
++	help
++	  This allows LEDs to be set to show cpu activity via sysfs.
++	  The LED will blink when the cpu is active and stay steady
++	  (on or off according to the trigger selected) when idle.
++	  Platform support is needed for this to work. If unsure, say Y.
++
+ config LEDS_TRIGGER_IDE_DISK
+ 	bool "LED IDE Disk Trigger"
+ 	depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
+Index: linux-2.6.23/drivers/leds/ledtrig-cpu.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.23/drivers/leds/ledtrig-cpu.c	2007-12-05 12:00:28.000000000 +0100
+@@ -0,0 +1,502 @@
++/*
++ * LEDs CPU activity trigger
++ *
++ * Author: John Bowler <jbowler@acm.org>
++ *
++ * Copyright (c) 2006 John Bowler
++ *
++ * Permission is hereby granted, free of charge, to any
++ * person obtaining a copy of this software and associated
++ * documentation files (the "Software"), to deal in the
++ * Software without restriction, including without
++ * limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of
++ * the Software, and to permit persons to whom the
++ * Software is furnished to do so, subject to the
++ * following conditions:
++ *
++ * The above copyright notice and this permission notice
++ * shall be included in all copies or substantial portions
++ * of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
++ * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
++ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
++ * SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ * OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++#include <linux/ctype.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/spinlock.h>
++#include <linux/timer.h>
++#include <linux/device.h>
++
++#include <linux/leds.h>
++#include "leds.h"
++
++//#include <linux/list.h>
++//#include <linux/sysdev.h>
++
++
++/*
++ * To simplify this the LED state is given for each case of
++ * CPU state - idle or active.  The LED can be:
++ *
++ * off
++ * flash - slow for idle, fast (flicker) for active
++ * on
++ *
++ * This gives two useless states - off/off and on/on
++ */
++typedef enum cpu_trigger_led_state {
++	cpu_led_off,
++	cpu_led_flash,
++	cpu_led_on,
++	cpu_led_invalid
++} cpu_trigger_led_state;
++
++static const char *const cpu_trigger_names[] = {
++	"off",
++	"flash",
++	"on",
++	"invalid"
++};
++
++/* Forward declaration - this is called back when an LED property
++ * is changed.
++ */
++static void leds_cpu_trigger_state_change(void);
++
++/*
++ * These constants define the actual mark/space of the flashing
++ * in jiffies.  msecs_to_jiffies rounds up and is compile time
++ * evaluable for constant arguments.  Writing the ?: stuff below
++ * this way ensures the compiler doesn't think it needs to
++ * compile in the math of msecs_to_jiffies.
++ *
++ * These values have been determined by experiment to work well
++ * for the ready/status LED on a LinkSys NSLU2 (light piped) and
++ * for the user LED on a Loft (Gateway Avila variant) board where
++ * the LED was directly visible.  Light Output Varies Everywhere.
++ */
++#define LEDS_CPU_ACTIVE_MARK	msecs_to_jiffies(40)
++#define LEDS_CPU_IDLE_MARK	msecs_to_jiffies(800)
++#define LEDS_CPU_ACTIVE_SPACE	msecs_to_jiffies(60)
++#define LEDS_CPU_IDLE_SPACE	msecs_to_jiffies(800)
++
++
++/*
++ * Individual LEDs ------------------------------------------------------------
++ */
++struct cpu_trigger_data {
++	cpu_trigger_led_state active; /* Behaviour when the CPU is active. */
++	cpu_trigger_led_state idle;   /* Behaviour when the CPU is idle. */
++};
++
++/*
++ * LED state change - called when the state of a single LED might
++ * have changed.  Returns true if the LED is blinking.  The argument
++ * is the blink state - the brightness of the blinking LED.
++ */
++static int leds_cpu_trigger_led_state_change(struct led_classdev *led,
++		int is_active, enum led_brightness brightness)
++{
++	int is_blinking = 0;
++
++	struct cpu_trigger_data *data = led->trigger_data;
++
++	/* Find the new brightness for the LED, if the LED is
++	 * set to flash then the brightness passed in is the
++	 * required value.
++	 */
++	if (likely(data != 0))
++		switch (is_active ? data->active : data->idle) {
++		case cpu_led_off:   brightness = LED_OFF;  break;
++		case cpu_led_flash: is_blinking = 1;       break;
++		case cpu_led_on:    brightness = LED_FULL; break;
++		}
++	else
++		brightness = is_active ? LED_FULL : LED_OFF;
++
++	led_set_brightness(led, brightness);
++
++	return is_blinking;
++}
++
++/*
++ * sysfs properties, the property is output at an list of the
++ * values with the current setting enclosed in []
++ */
++static ssize_t leds_cpu_trigger_show_prop(struct device *dev,
++		struct device_attribute *attr, char *buf, size_t where)
++{
++	struct led_classdev     *led = dev_get_drvdata(dev);
++	cpu_trigger_led_state  item = cpu_led_invalid, i;
++	char                  *next;
++
++	if (likely(led->trigger_data != 0))
++		item = *(const cpu_trigger_led_state*)(
++				led->trigger_data + where);
++
++	for (i=0, next=buf; i<cpu_led_invalid; ++i) {
++		const char *name = cpu_trigger_names[i];
++		size_t len = strlen(name);
++
++		if (i == item)
++			*next++ = '[';
++		memcpy(next, name, len);
++		next += len;
++		if (i == item)
++			*next++ = ']';
++		*next++ = ' ';
++	}
++
++	next[-1] = '\n';
++	*next++ = 0;
++
++	return next - buf;
++}
++
++static ssize_t leds_cpu_trigger_show_active(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	return leds_cpu_trigger_show_prop(dev, attr, buf,
++			offsetof(struct cpu_trigger_data, active));
++}
++
++static ssize_t leds_cpu_trigger_show_idle(struct device *dev,
++		struct device_attribute *attr, char *buf)
++{
++	return leds_cpu_trigger_show_prop(dev, attr, buf,
++			offsetof(struct cpu_trigger_data, idle));
++}
++
++/*
++ * Any matching leading substring selects a property - so "onoffonoff"
++ * sets the property to off.
++ */
++static ssize_t leds_cpu_trigger_store_prop(struct device *dev,
++		struct device_attribute *attr, const char *buf,
++		size_t size, size_t where)
++{
++	size_t rc = 0;
++	cpu_trigger_led_state value = 0/*sic*/;
++	struct led_classdev *led;
++
++	/* ignore space characters before the value. */
++	while (rc < size && isspace(buf[rc]))
++		++rc;
++	if (rc >= size)
++		return rc;
++
++	/* look for a simple match against the trigger name, case
++	 * sensitive.
++	 */
++	do {
++		const char *name = cpu_trigger_names[value];
++		size_t len = strlen(name);
++		if (len <= size && memcmp(buf+rc, name, len) == 0) {
++			rc = len;
++			break;
++		}
++		if (++value >= cpu_led_invalid)
++			return -EINVAL;
++	} while (1);
++
++	led = dev_get_drvdata(dev);
++	if (likely(led->trigger_data != 0))
++		*(cpu_trigger_led_state*)(
++				led->trigger_data + where) = value;
++
++	return rc;
++}
++
++static ssize_t leds_cpu_trigger_store_active(struct device *dev,
++		struct device_attribute *attr, const char *buf, size_t size)
++{
++	ssize_t rc = leds_cpu_trigger_store_prop(dev, attr, buf, size,
++			offsetof(struct cpu_trigger_data, active));
++	/*
++	 * At least one CPU must be active (otherwise who is doing this?)
++	 * Call down into the global state below to cause an update
++	 * to happen now.
++	 */
++	leds_cpu_trigger_state_change();
++	return rc;
++}
++
++static ssize_t leds_cpu_trigger_store_idle(struct device *dev,
++		struct device_attribute *attr, const char *buf, size_t size)
++{
++	return leds_cpu_trigger_store_prop(dev, attr, buf, size,
++			offsetof(struct cpu_trigger_data, idle));
++}
++
++static DEVICE_ATTR(active, 0644, leds_cpu_trigger_show_active,
++					leds_cpu_trigger_store_active);
++
++static DEVICE_ATTR(idle, 0644, leds_cpu_trigger_show_idle,
++					leds_cpu_trigger_store_idle);
++
++/*
++ * Activate and deactivate are called on individual LEDs when the
++ * LED trigger property is changed.
++ */
++static void leds_cpu_trigger_activate(struct led_classdev *led)
++{
++	/*
++	 * The initial setting of the trigger is simple CPU activity
++	 * with the LED off for idle and on for active.  Consequently
++	 * there is no need to mess with the global state initially,
++	 * we know the CPU is active at this moment!
++	 */
++	int rc;
++	struct cpu_trigger_data *data = kmalloc(sizeof *data, GFP_KERNEL);
++	if (unlikely(data == 0))
++		return;
++
++	data->active = cpu_led_on;
++	data->idle = cpu_led_off;
++	led->trigger_data = data;
++
++	rc = device_create_file(led->dev, &dev_attr_active);
++	if (rc)
++		goto err_out;
++	rc = device_create_file(led->dev, &dev_attr_idle);
++	if (rc)
++		goto err_out_active;
++
++	led_set_brightness(led, LED_FULL);
++	return;
++
++err_out_active:
++	device_remove_file(led->dev, &dev_attr_active);
++err_out:
++	led->trigger_data = NULL;
++	kfree(data);
++}
++
++static void leds_cpu_trigger_deactivate(struct led_classdev *led)
++{
++	struct cpu_trigger_data *data = led->trigger_data;
++	if (likely(data != 0)) {
++		led_set_brightness(led, LED_OFF);
++
++		device_remove_file(led->dev, &dev_attr_idle);
++		device_remove_file(led->dev, &dev_attr_active);
++
++		led->trigger_data = 0;
++		kfree(data);
++	}
++}
++
++
++/*
++ * Global state  --------------------------------------------------------------
++ *
++ * This is global because the CPU state is global and we only need one timer to
++ * do this stuff.
++ */
++typedef struct leds_cpu_trigger_data {
++	struct led_trigger trigger; /* the lock in here protects everything */
++	struct timer_list  timer;
++	unsigned long      last_active_time; /* record of last jiffies */
++	unsigned long      last_idle_time;   /* record of last jiffies */
++	int                count_active;     /* number of active CPUs */
++} leds_cpu_trigger_data;
++
++/*
++ * Mark state - uses the current time (jiffies) to work out
++ * whether this is a mark or space.
++ */
++static int leds_cpu_trigger_mark(struct leds_cpu_trigger_data *data,
++		unsigned long now) {
++	if (data->count_active > 0) {
++		unsigned long elapsed = now - data->last_active_time;
++		elapsed %= LEDS_CPU_ACTIVE_SPACE + LEDS_CPU_ACTIVE_MARK;
++		data->last_active_time = now - elapsed;
++		return elapsed > LEDS_CPU_ACTIVE_SPACE;
++	} else {
++		unsigned long elapsed = now - data->last_idle_time;
++		elapsed %= LEDS_CPU_IDLE_SPACE + LEDS_CPU_IDLE_MARK;
++		data->last_idle_time = now - elapsed;
++		return elapsed > LEDS_CPU_IDLE_SPACE;
++	}
++}
++
++
++/*
++ * State change - given information about the nature of the
++ * (possible) state change call up to each LED to adjust its
++ * state.  Returns true if any LED is blinking.  The lock
++ * must be held (a read lock is adequate).
++ */
++static int leds_cpu_trigger_scan_leds(struct leds_cpu_trigger_data *data,
++		unsigned long now)
++{
++	int blinking = 0;
++	const int active = data->count_active > 0;
++	const enum led_brightness brightness =
++		leds_cpu_trigger_mark(data, now) ? LED_FULL : LED_OFF;
++	struct list_head *entry;
++
++	list_for_each(entry, &data->trigger.led_cdevs) {
++		struct led_classdev *led =
++			list_entry(entry, struct led_classdev, trig_list);
++
++		blinking |= leds_cpu_trigger_led_state_change(led,
++				active, brightness);
++	}
++
++	return blinking;
++}
++
++/*
++ * Set the timer correctly according to the current state, the lock
++ * must be held for write.
++ */
++static void leds_cpu_trigger_set_timer(struct leds_cpu_trigger_data *state,
++		unsigned long now)
++{
++	unsigned long next;
++	if (state->count_active > 0) {
++		next = state->last_active_time;
++		if (now - next > LEDS_CPU_ACTIVE_SPACE)
++			next += LEDS_CPU_ACTIVE_MARK;
++		next += LEDS_CPU_ACTIVE_SPACE;
++	} else {
++		next = state->last_idle_time;
++		if (now - next > LEDS_CPU_IDLE_SPACE)
++			next += LEDS_CPU_IDLE_MARK;
++		next += LEDS_CPU_IDLE_SPACE;
++	}
++	mod_timer(&state->timer, next);
++}
++
++/*
++ * The timer callback if the LED is currently flashing, the callback
++ * calls the state change function and, if that returns true, meaning
++ * that at least one LED is still blinking, the timer is restarted
++ * with the correct timeout.
++ */
++static void leds_cpu_trigger_timer_callback(unsigned long data)
++{
++	struct leds_cpu_trigger_data *state =
++				(struct leds_cpu_trigger_data *)data;
++
++	write_lock(&state->trigger.leddev_list_lock);
++	{
++		unsigned long now = jiffies;
++
++		/* If at least one LED is set to flash; set the timer
++		 * again (this won't reset the timer set within the
++		 * idle loop).
++		 */
++		if (leds_cpu_trigger_scan_leds(state, now))
++			leds_cpu_trigger_set_timer(state, now);
++	}
++	write_unlock(&state->trigger.leddev_list_lock);
++}
++
++
++/*
++ * There is one global control structure, one timer and one set
++ * of state for active CPUs shared across all the LEDs.  Individual
++ * LEDs say how this state to be handled.  It is currently *not*
++ * possible to show per-cpu activity on individual LEDs, the code
++ * maintains a count of active CPUs and the state is only 'idle'
++ * if all CPUs are idle.
++ */
++static struct leds_cpu_trigger_data leds_cpu_trigger = {
++	.trigger = {
++		.name       = "cpu",
++		.activate   = leds_cpu_trigger_activate,
++		.deactivate = leds_cpu_trigger_deactivate,
++	} ,
++	.timer   = TIMER_INITIALIZER(leds_cpu_trigger_timer_callback, 0,
++			(unsigned long)&leds_cpu_trigger),
++	.last_active_time = 0,
++	.last_idle_time   = 0,
++	.count_active     = 0,
++};
++
++/*
++ * State change - callback from an individual LED on a property change which
++ * might require a redisplay.
++ */
++static void leds_cpu_trigger_state_change() {
++	write_lock(&leds_cpu_trigger.trigger.leddev_list_lock);
++	{
++		unsigned long now = jiffies;
++
++		if (leds_cpu_trigger_scan_leds(&leds_cpu_trigger, now) &&
++			!timer_pending(&leds_cpu_trigger.timer))
++			leds_cpu_trigger_set_timer(&leds_cpu_trigger, now);
++	}
++	write_unlock(&leds_cpu_trigger.trigger.leddev_list_lock);
++}
++
++/*
++ * Called from every CPU at the start and end of the idle loop.
++ * The active count is initially 0, even though CPUs are running,
++ * so the code below must check for the resultant underflow.
++ *
++ * If the idle behaviour is 'flash' then when the timer times out
++ * it will take the CPU out of idle, set the active state (which
++ * may also be flash), drop back into idle and reset the timer to
++ * the idle timeout...
++ */
++static void leds_cpu_trigger_idle(int is_idle)
++{
++	write_lock(&leds_cpu_trigger.trigger.leddev_list_lock);
++	if ((is_idle && leds_cpu_trigger.count_active > 0 &&
++				--leds_cpu_trigger.count_active == 0) ||
++	    (!is_idle && leds_cpu_trigger.count_active < num_online_cpus() &&
++	     			++leds_cpu_trigger.count_active == 1)) {
++		unsigned long now = jiffies;
++
++		/* State change - the system just became idle or active,
++		 * call the del_timer first in an attempt to minimise
++		 * getting a timer interrupt which will take us unnecessarily
++		 * out of idle (this doesn't matter).
++		 */
++		del_timer(&leds_cpu_trigger.timer);
++		if (leds_cpu_trigger_scan_leds(&leds_cpu_trigger, now))
++			leds_cpu_trigger_set_timer(&leds_cpu_trigger, now);
++	}
++	write_unlock(&leds_cpu_trigger.trigger.leddev_list_lock);
++}
++
++/*
++ * Module init and exit - register the trigger, then store
++ * the idle callback in the arch-specific global.  For this
++ * module to link (into the kernel) or load (into a running
++ * kernel) the architecture must define the leds_idle global.
++ */
++static int __init leds_cpu_trigger_init(void)
++{
++	int rc = led_trigger_register(&leds_cpu_trigger.trigger);
++	leds_idle = leds_cpu_trigger_idle;
++	return rc;
++}
++module_init(leds_cpu_trigger_init);
++
++static void __exit leds_cpu_trigger_exit(void)
++{
++	leds_idle = 0;
++	del_timer_sync(&leds_cpu_trigger.timer);
++	led_trigger_unregister(&leds_cpu_trigger.trigger);
++}
++module_exit(leds_cpu_trigger_exit);
++
++MODULE_AUTHOR("John Bowler <jbowler@acm.org>");
++MODULE_DESCRIPTION("CPU activity LED trigger");
++MODULE_LICENSE("Dual MIT/GPL");
+Index: linux-2.6.23/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.23.orig/drivers/leds/Makefile	2007-12-05 12:00:28.000000000 +0100
++++ linux-2.6.23/drivers/leds/Makefile	2007-12-05 12:00:28.000000000 +0100
+@@ -23,3 +23,4 @@
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
+ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
+ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
++obj-$(CONFIG_LEDS_TRIGGER_CPU_ACTIVITY)	+= ledtrig-cpu.o
+Index: linux-2.6.23/include/linux/leds.h
+===================================================================
+--- linux-2.6.23.orig/include/linux/leds.h	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/include/linux/leds.h	2007-12-05 12:00:28.000000000 +0100
+@@ -123,4 +123,13 @@
+ };
+ 
+ 
++/*
++ * CPU activity indication.
++ */
++/* Idle callback - call with is_idle==1 at the start of the idle loop
++ * and with is_idle==0 at the end.  This symbol must be defined by
++ * the arch core to be able to use LEDS_TRIGGER_CPU_ACTIVITY
++ */
++extern void (*leds_idle)(int is_idle);
++
+ #endif		/* __LINUX_LEDS_H_INCLUDED */
diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
index 6ac9151be6..be9a93bc54 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23
-# Wed Nov 28 23:32:31 2007
+# Wed Dec  5 10:34:37 2007
 #
 # CONFIG_PPC64 is not set
 
@@ -1454,12 +1454,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
-CONFIG_LEDS_MPC8313E_RDB=m
+CONFIG_LEDS_MPC8313E_RDB=y
 
 #
 # LED Triggers
@@ -1467,6 +1467,7 @@ CONFIG_LEDS_MPC8313E_RDB=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
index 0310746dfe..be322be927 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
@@ -1,6 +1,6 @@
 diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig
 --- linux-2.6.23.orig/drivers/leds/Kconfig	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Kconfig	2007-11-29 09:02:42.000000000 +0100
++++ linux-2.6.23/drivers/leds/Kconfig	2007-12-14 15:32:37.000000000 +0100
 @@ -101,6 +101,12 @@
  	  outputs. To be useful the particular board must have LEDs
  	  and they must be connected to the GPIO lines.
@@ -16,8 +16,8 @@ diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconf
  config LEDS_TRIGGERS
 diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c
 --- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c	2007-11-29 09:02:42.000000000 +0100
-@@ -0,0 +1,128 @@
++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c	2007-12-14 15:32:55.000000000 +0100
+@@ -0,0 +1,171 @@
 +/*
 + * drivers/leds/leds-mpc8313e-rdb.c
 + * Copyright (C) 2007 Leon Woestenberg <leon@sidebranch.com>
@@ -38,76 +38,118 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +#include <linux/err.h>
 +#include <asm/io.h>
 +
-+int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
-+                      int assignment, int has_irq);
-+int par_io_data_set(u8 port, u8 pin, u8 val);
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
 +
-+static struct platform_dev *leds_pdev = NULL;
++static struct platform_device *leds_pdev = NULL;
 +static struct resource *led_mem = NULL;
-+static void *p = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0xff;
 +
-+static void mpc8313leds_green_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	int d = ioread16(p);
-+	iowrite16(value?d&~1:d|1, p);
-+}
-+
-+static struct led_classdev mpc8313_green_led = {
-+	.name                   = "mpc8313:green",
-+	.brightness_set         = mpc8313leds_green_set,
-+};
-+
-+static void mpc8313leds_yellow_set(struct led_classdev *led_cdev, enum led_brightness value)
-+{
-+	int d = ioread16(p);
-+	iowrite16(value?d&~2:d|2, p);
-+}
-+
-+static struct led_classdev mpc8313_yellow_led = {
-+	.name                   = "mpc8313:yellow",
-+	.brightness_set         = mpc8313leds_yellow_set,
++struct mpc8313_led {
++	struct led_classdev cdev;
++	u8 bitmask;
 +};
 +
-+static void mpc8313leds_red_set(struct led_classdev *led_cdev, enum led_brightness value)
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
 +{
-+	int d = ioread16(p);
-+	iowrite16(value?d&~4:d|4, p);
++	struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++	if (value)
++		led_state &= ~led_dev->bitmask;
++	else
++		led_state |= led_dev->bitmask;
++	iowrite8(led_state, led_io);
 +}
 +
-+static struct led_classdev mpc8313_red_led = {
-+	.name                   = "mpc8313:red",
-+	.brightness_set         = mpc8313leds_red_set,
++static struct mpc8313_led mpc8313_leds[] = {
++	{
++		.cdev = {
++			.name		= "mpc8313:led0",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 1,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led1",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 2,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led2",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 4,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led3",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 8,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:led4",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 16,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:green",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 32,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:yellow",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 64,
++	},
++	{
++		.cdev = {
++			.name		= "mpc8313:red",
++			.brightness_set	= mpc8313leds_set,
++		},
++		.bitmask	= 128,
++	},
 +};
 +
 +static int mpc8313leds_probe(struct platform_device *pdev)
 +{
++	int i;
 +	int ret;
-+        
-+	ret = led_classdev_register(&pdev->dev, &mpc8313_green_led);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = led_classdev_register(&pdev->dev, &mpc8313_yellow_led);
-+	if (ret < 0)
-+		return ret;
-+	
-+	ret = led_classdev_register(&pdev->dev, &mpc8313_red_led);
-+	if (ret < 0)
-+		return ret;
++       
++	for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++		ret = led_classdev_register(&pdev->dev,
++			&mpc8313_leds[i].cdev);
++	}
++
++	if (ret < 0 && i > 1) {
++		for (i = i - 2; i >= 0; i--)
++			led_classdev_unregister(&mpc8313_leds[i].cdev);
++	}
 +	
 +	return ret;
 +}
 +
 +static int mpc8313leds_remove(struct platform_device *pdev)
 +{
-+	led_classdev_unregister(&mpc8313_green_led);
-+	led_classdev_unregister(&mpc8313_yellow_led);
-+	led_classdev_unregister(&mpc8313_red_led);
++	int i;
++
++	for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++		led_classdev_unregister(&mpc8313_leds[i].cdev);
++	
 +	return 0;
 +}
 +
 +static struct platform_driver mpc8313leds_driver = {
-+      .driver         = {
++	.driver         = {
 +		.name   = "mpc8313-leds",
 +		.owner  = THIS_MODULE,
 +	},
@@ -117,15 +159,16 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +
 +static int __init mpc8313leds_init(void)
 +{
-+	led_mem = request_mem_region(0xfa000000, 0x100, "mpc8313-leds");
-+	if (led_mem == NULL) return -ENOMEM;
-+	p = ioremap(0xfa000000, 0x100);
-+	if (p == NULL)
++	if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++		return -ENOMEM;
++	if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
 +	{
-+		if (led_mem) release_mem_region(0xfa000000, 0x100);
++		release_mem_region(LEDS_BASE, LEDS_SIZE);
 +		led_mem = NULL;
 +		return -ENOMEM;
 +	}
++	iowrite8(led_state, led_io);
++
 +	leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
 +
 +	return platform_driver_register(&mpc8313leds_driver);
@@ -133,7 +176,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +
 +static void __exit mpc8313leds_exit(void)
 +{
-+	if (led_mem) release_mem_region(0xfa000000, 0x100);
++	if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
 +	led_mem = NULL;
 +	platform_driver_unregister(&mpc8313leds_driver);
 +
@@ -148,7 +191,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver
 +MODULE_LICENSE("GPL");
 diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile
 --- linux-2.6.23.orig/drivers/leds/Makefile	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/leds/Makefile	2007-11-29 09:03:09.000000000 +0100
++++ linux-2.6.23/drivers/leds/Makefile	2007-12-14 15:32:37.000000000 +0100
 @@ -17,6 +17,7 @@
  obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
  obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
index 7c6cbcaa0b..4177a3d4a9 100644
--- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
+++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
@@ -1,7 +1,15 @@
 diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts
 --- linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts	2007-11-29 19:32:21.000000000 +0100
-@@ -60,6 +60,12 @@
++++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts	2007-12-01 13:16:55.000000000 +0100
+@@ -54,12 +54,20 @@
+ 		};
+ 
+ 		i2c@3000 {
++			#address-cells = <1>;
++			#size-cells = <0>;
+ 			device_type = "i2c";
+ 			compatible = "fsl-i2c";
+ 			reg = <3000 100>;
  			interrupts = <e 8>;
  			interrupt-parent = < &ipic >;
  			dfsrr;
@@ -16,7 +24,7 @@ diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/a
  		i2c@3100 {
 diff -urN linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c
 --- linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c	2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c	2007-11-29 19:31:58.000000000 +0100
++++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c	2007-12-01 13:08:30.000000000 +0100
 @@ -319,6 +319,12 @@
  	{"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
  	{"ricoh,rv5c386",  "rtc-rs5c372", "rv5c386",},
diff --git a/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig b/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
index f1990e62cc..c4a0e6c8cf 100644
--- a/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
+++ b/packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
@@ -1413,12 +1413,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
-CONFIG_LEDS_MPC832X=m
+CONFIG_LEDS_MPC832X=y
 
 #
 # LED Triggers
diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
index 6d2472935f..46fa4295b6 100644
--- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board"
 SECTION = "kernel"
 HOMEPAGE = "N/A"
 LICENSE = "GPL"
-DEPENDS += "uboot-utils"
+DEPENDS += "u-boot-utils-native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            http://www.boundarydevices.com/boundary-2.6.22-2007-07-22.patch.bz2;patch=1 \
diff --git a/packages/linux/linux-efika-2.6.20/defconfig b/packages/linux/linux-efika-2.6.20/defconfig
index c77a8d4048..2f532c122f 100644
--- a/packages/linux/linux-efika-2.6.20/defconfig
+++ b/packages/linux/linux-efika-2.6.20/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20.20-cfs-v22
-# Wed Nov 28 22:31:42 2007
+# Fri Dec  7 20:14:16 2007
 #
 # CONFIG_PPC64 is not set
 CONFIG_PPC32=y
@@ -1008,7 +1008,14 @@ CONFIG_GEN_RTC=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 CONFIG_AGP=m
-# CONFIG_DRM is not set
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 # CONFIG_RAW_DRIVER is not set
 
 #
diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb
index c59508cdf3..630e5a6274 100644
--- a/packages/linux/linux-efika_2.6.20.20.bb
+++ b/packages/linux/linux-efika_2.6.20.20.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "efika"
 
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index 9a9a4d4df3..3e0302fe5f 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Linux Kernel for the Gumstix"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "uboot-utils"
+DEPENDS = "u-boot-utils-native"
 
 COMPATIBLE_MACHINE = "gumstix"
 
diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb
index 750be1a648..2d2a37f716 100644
--- a/packages/linux/linux-hackndev-2.6_git.bb
+++ b/packages/linux/linux-hackndev-2.6_git.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
 HOMEPAGE = "http://www.hackndev.com/"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
 
-SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=http \
+SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
diff --git a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus620/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
index 6d2f23c72d..6a2bc0475b 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:25 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:12 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1127,7 +1127,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1151,7 +1151,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus730/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
index 21d18f02ba..f6c7789570 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:26 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:12 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1248,7 +1248,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1272,7 +1272,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
index e3a31bd3a1..89bfc0908a 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:26 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:13 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1112,7 +1112,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1136,7 +1136,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
index a21a83339e..b1f87fb443 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:27 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:13 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1102,7 +1102,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1126,7 +1126,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
index 3c7ebb457d..902434149b 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:27 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:14 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1182,7 +1182,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1206,7 +1206,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
index c46793dbe6..1d53dfd987 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:28 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:14 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -510,8 +510,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
@@ -1583,7 +1583,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1607,7 +1607,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1710,7 +1710,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
index b20e9624da..a8012cc460 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:28 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:15 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1101,7 +1101,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1125,7 +1125,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
index e23511467a..d110b3f223 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:29 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:15 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -954,6 +954,7 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
+# CONFIG_MMC_ASIC1 is not set
 
 #
 # Real Time Clock
@@ -1098,7 +1099,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1122,7 +1123,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
index d52b267246..fe9fa52b84 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:29 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:16 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1066,6 +1066,7 @@ CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
 CONFIG_MMC_ASIC3=y
+# CONFIG_MMC_ASIC1 is not set
 
 #
 # Real Time Clock
@@ -1216,7 +1217,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1240,7 +1241,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
index 1f47995434..d0b8f08fbb 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:30 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:17 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -158,12 +158,9 @@ CONFIG_BOARD_IRQ_MAP_BIG=y
 # CONFIG_MACH_H3900 is not set
 CONFIG_MACH_H4000=y
 CONFIG_MACH_H4300=y
-CONFIG_IPAQ_H4000_IRDA=m
 CONFIG_IPAQ_H4000_LCD=y
 CONFIG_IPAQ_H4000_BACKLIGHT=y
 CONFIG_IPAQ_H4000_PCMCIA=y
-# CONFIG_IPAQ_H4000_BUTTONS is not set
-CONFIG_IPAQ_H4000_LEDS=y
 CONFIG_IPAQ_H4000_BT=m
 CONFIG_IPAQ_H4300_KBD=y
 # CONFIG_MACH_H4700 is not set
@@ -509,7 +506,12 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1340,7 +1342,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1364,7 +1366,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1459,7 +1461,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1467,7 +1469,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
index 8beab42a17..a293dfea57 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:30 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:17 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1218,7 +1218,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1242,7 +1242,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
index cc6ea81fbc..0733574b59 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:31 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:19 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1122,7 +1122,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1146,7 +1146,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
index 85ff1a53d7..04c849d5b8 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:32 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:19 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -445,7 +445,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1208,7 +1213,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1232,7 +1237,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1327,7 +1332,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1335,7 +1340,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
index df6c1c827d..c295e2a1c6 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:32 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:20 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1129,7 +1129,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1153,7 +1153,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
index 690c3d5993..61f84a4588 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:33 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:20 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -470,7 +470,12 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1140,6 +1145,7 @@ CONFIG_SND_PXA2XX_SOC_BLUEANGEL=m
 # CONFIG_SND_SOC_WM8976 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8980 is not set
+# CONFIG_SND_SOC_WM9705 is not set
 # CONFIG_SND_SOC_WM9713 is not set
 # CONFIG_SND_SOC_WM9712 is not set
 CONFIG_SND_SOC_UDA1380=m
@@ -1363,7 +1369,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1387,7 +1393,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1482,7 +1488,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1490,7 +1496,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/pimlico/contacts-0.7/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/pimlico/contacts-0.7/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
index 5389f69e7a..507d5e4541 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:33 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:21 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1125,7 +1125,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1149,7 +1149,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/pimlico/tasks-0.12/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/pimlico/tasks-0.12/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
index ebdd7b8e9f..9ee6a3cdd3 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:34 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:21 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -449,7 +449,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1235,7 +1240,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1259,7 +1264,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1354,7 +1359,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1362,7 +1367,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/timezones/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/timezones/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
index 9a9c2451a1..9da03d8f2e 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:34 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:22 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -172,6 +172,7 @@ CONFIG_HTCUNIVERSAL_BUTTONS=y
 CONFIG_HTCUNIVERSAL_BLUETOOTH=m
 CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y
 CONFIG_HTCUNIVERSAL_PHONE=m
+# CONFIG_HTCUNIVERSAL_MDOC_G3 is not set
 CONFIG_HTCUNIVERSAL_AK4641=m
 # CONFIG_MACH_HTCALPINE is not set
 # CONFIG_MACH_MAGICIAN is not set
@@ -455,7 +456,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1243,7 +1249,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1267,7 +1273,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1362,7 +1368,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1370,7 +1376,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/zroadmap/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zroadmap/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
index 6b7f91d4d4..d69e574934 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:35 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:22 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1100,7 +1100,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1124,7 +1124,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/zroadmap/files/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/zroadmap/files/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
index 90ecb03be0..97403f4a22 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:31 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:18 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -518,8 +518,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
@@ -1060,7 +1060,7 @@ CONFIG_ADC_ADS7846_SSP=y
 # CONFIG_HTC_ASIC2 is not set
 CONFIG_HTC_ASIC3=y
 # CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTC_EGPIO is not set
+CONFIG_HTC_EGPIO=y
 # CONFIG_HTC_BBKEYS is not set
 CONFIG_HTC_ASIC3_DS1WM=y
 # CONFIG_SOC_SAMCOP is not set
@@ -1600,7 +1600,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1624,7 +1624,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1727,7 +1727,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/looxc550/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
index 57d2552651..83aff689f4 100644
--- a/packages/linux/linux-handhelds-2.6/looxc550/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:35 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:23 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1125,7 +1125,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1149,7 +1149,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
index 6817d85f2d..477ae6ead4 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:31 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:18 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1129,6 +1129,7 @@ CONFIG_SND_PXA2XX_SOC_MAGICIAN=m
 # CONFIG_SND_SOC_WM8976 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8980 is not set
+# CONFIG_SND_SOC_WM9705 is not set
 # CONFIG_SND_SOC_WM9713 is not set
 # CONFIG_SND_SOC_WM9712 is not set
 CONFIG_SND_SOC_UDA1380=m
@@ -1453,7 +1454,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1477,7 +1478,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/rx1950/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
index 01317611b0..f717a91179 100644
--- a/packages/linux/linux-handhelds-2.6/rx1950/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:36 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:23 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1159,7 +1159,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1183,7 +1183,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
index 3096d39118..af0393df6b 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh17
-# Sun Nov 11 00:39:36 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:24 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -445,7 +445,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1071,6 +1076,7 @@ CONFIG_SND_S3C24XX_SOC_RX3000=m
 # CONFIG_SND_SOC_WM8976 is not set
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8980 is not set
+# CONFIG_SND_SOC_WM9705 is not set
 # CONFIG_SND_SOC_WM9713 is not set
 # CONFIG_SND_SOC_WM9712 is not set
 CONFIG_SND_SOC_UDA1380=m
@@ -1276,7 +1282,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1300,7 +1306,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_1250 is not set
 CONFIG_NLS_CODEPAGE_1251=m
 # CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -1397,7 +1403,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1405,7 +1411,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index f58ef672aa..0db5e93974 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -23,7 +23,7 @@ HHV     ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
 
-KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}"
+KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin"
 
 do_configure() {
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
index ae3741e872..a9dd604d8f 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
@@ -5,6 +5,10 @@ PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
index b34d4630a0..cb6e7efc13 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
@@ -5,6 +5,10 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 275602762d..48f3f224e2 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -5,6 +5,10 @@ PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index 4e008f5b6e..89cb68548f 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -6,10 +6,14 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV     = "14"
+HHV     = "20"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.21.7 b/packages/linux/linux-ixp4xx/defconfig-2.6.21.7
new file mode 100644
index 0000000000..b7da2803fb
--- /dev/null
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.21.7
@@ -0,0 +1,2092 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21
+# Thu Nov 22 23:05:47 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+# CONFIG_GENERIC_GPIO is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_SLAB=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
+CONFIG_ARCH_IXP4XX=y
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+
+#
+# Intel IXP4xx Implementation Options
+#
+
+#
+# IXP4xx Platforms
+#
+CONFIG_MACH_NSLU2=y
+CONFIG_MACH_AVILA=y
+CONFIG_MACH_LOFT=y
+# CONFIG_ARCH_ADI_COYOTE is not set
+CONFIG_ARCH_IXDP425=y
+CONFIG_MACH_IXDPG425=y
+# CONFIG_MACH_IXDP465 is not set
+CONFIG_ARCH_IXCDP1100=y
+# CONFIG_ARCH_PRPMC1100 is not set
+CONFIG_MACH_NAS100D=y
+CONFIG_MACH_DSMG600=y
+CONFIG_ARCH_IXDP4XX=y
+CONFIG_MACH_FSG=y
+# CONFIG_MACH_GTWX5715 is not set
+
+#
+# IXP4xx Options
+#
+CONFIG_DMABOUNCE=y
+# CONFIG_IXP4XX_INDIRECT_PCI is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+# CONFIG_IWMMXT is not set
+CONFIG_XSCALE_PMU=y
+
+#
+# Bus support
+#
+CONFIG_PCI=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs ip=dhcp noirqdebug console=ttyS0,115200n8"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_SCH_CLK_JIFFIES is not set
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
+CONFIG_NET_CLS_ROUTE=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+CONFIG_NFTL=y
+CONFIG_NFTL_RW=y
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+# CONFIG_MTD_CFI_NOSWAP is not set
+CONFIG_MTD_CFI_BE_BYTE_SWAP=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_IXP4XX=y
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+# CONFIG_PNPACPI is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=4
+CONFIG_BLK_DEV_RAM_SIZE=10240
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+
+#
+# SCSI low-level drivers
+#
+CONFIG_ISCSI_TCP=m
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+CONFIG_SATA_VIA=y
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=y
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_IXP4XX_CF=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_RAID5_RESHAPE=y
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_IXP4XX_QMGR=y
+CONFIG_IXP4XX_NPE=y
+CONFIG_IXP4XX_NPE_FW_LOAD=y
+CONFIG_IXP4XX_NPE_FW_MTD=y
+CONFIG_IXP4XX_MAC=y
+CONFIG_IXP4XX_CRYPTO=m
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
+CONFIG_R8169_VLAN=y
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+CONFIG_VIA_VELOCITY=y
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_BCM43XX is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+CONFIG_NETCONSOLE=m
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_IXP4XX_BEEPER=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_COMPUTONE is not set
+# CONFIG_ROCKETPORT is not set
+# CONFIG_CYCLADES is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_MOXA_SMARTIO_NEW is not set
+# CONFIG_ISI is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_SYNCLINK_GT is not set
+CONFIG_N_HDLC=m
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+# CONFIG_STALDRV is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IXP4XX_WATCHDOG=m
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_IXP4XX=y
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C_ISA=m
+CONFIG_I2C_IXP4XX=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+CONFIG_SENSORS_EEPROM=y
+CONFIG_SENSORS_PCF8574=m
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+CONFIG_W1=m
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+CONFIG_SENSORS_W83781D=m
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_AD7418=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# LED devices
+#
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_IXP4XX=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+
+#
+# Video Capture Adapters
+#
+
+#
+# Video Capture Adapters
+#
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
+CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_BT848 is not set
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DPC=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CAFE_CCIC=m
+
+#
+# V4L USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_29XXX=y
+CONFIG_VIDEO_PVRUSB2_24XXX=y
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+CONFIG_USB_DSBR=m
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# ALSA ARM devices
+#
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+
+#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# HID Devices
+#
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=y
+# CONFIG_USB_U132_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+CONFIG_USB_STORAGE_FREECOM=y
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+CONFIG_USB_YEALINK=m
+# CONFIG_USB_XPAD is not set
+CONFIG_USB_ATI_REMOTE=m
+CONFIG_USB_ATI_REMOTE2=m
+CONFIG_USB_KEYSPAN_REMOTE=m
+# CONFIG_USB_APPLETOUCH is not set
+# CONFIG_USB_GTCO is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_HP4X is not set
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_EZUSB=y
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+CONFIG_USB_ADUTUX=m
+# CONFIG_USB_AUERSWALD is not set
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_BERRY_CHARGE=m
+CONFIG_USB_LED=m
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+# CONFIG_USB_IDMOUSE is not set
+CONFIG_USB_FTDI_ELAN=m
+# CONFIG_USB_APPLEDISPLAY is not set
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+CONFIG_RTC_DRV_X1205=y
+CONFIG_RTC_DRV_DS1307=y
+# CONFIG_RTC_DRV_DS1553 is not set
+CONFIG_RTC_DRV_ISL1208=y
+CONFIG_RTC_DRV_DS1672=y
+# CONFIG_RTC_DRV_DS1742 is not set
+CONFIG_RTC_DRV_PCF8563=y
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_SQUASHFS_VMALLOC is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_TEST=m
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-ixp4xx/nslu2/.mtn2git_empty b/packages/linux/linux-ixp4xx/nslu2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-ixp4xx/nslu2/.mtn2git_empty
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.21.6 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.21.7
index 42527b3dfc..457d379f5e 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.21.6
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.21.7
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
-# Thu Nov 22 23:05:47 2007
+# Linux kernel version: 2.6.21.6
+# Sat Dec  8 13:47:37 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -222,7 +222,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8"
+CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs ip=dhcp noirqdebug console=ttyS0,115200n8"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 
@@ -272,7 +272,7 @@ CONFIG_INET=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
+CONFIG_NET_IPIP=m
 # CONFIG_NET_IPGRE is not set
 # CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
@@ -281,11 +281,11 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -503,9 +503,6 @@ CONFIG_IPDDP_DECAP=y
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_SCH_CLK_JIFFIES is not set
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 CONFIG_NET_CLS_ROUTE=y
 
 #
@@ -2028,14 +2025,14 @@ CONFIG_FRAME_POINTER=y
 #
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
@@ -2043,10 +2040,10 @@ CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_TWOFISH=m
@@ -2062,7 +2059,7 @@ CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_TEST=m
 
 #
diff --git a/packages/linux/linux-ixp4xx_2.6.21.6.bb b/packages/linux/linux-ixp4xx_2.6.21.7.bb
index 7eacf2b8eb..4d26621241 100644
--- a/packages/linux/linux-ixp4xx_2.6.21.6.bb
+++ b/packages/linux/linux-ixp4xx_2.6.21.7.bb
@@ -2,7 +2,7 @@ require linux.inc
 require linux-ixp4xx.inc
 
 VANILLA_VERSION = "2.6.21"
-KERNEL_RELEASE = "2.6.21.6"
+KERNEL_RELEASE = "2.6.21.7"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
 PR = "r0"
diff --git a/packages/linux/linux-ixp4xx_2.6.23.8.bb b/packages/linux/linux-ixp4xx_2.6.23.8.bb
index a6dcca41b5..ab621f310a 100644
--- a/packages/linux/linux-ixp4xx_2.6.23.8.bb
+++ b/packages/linux/linux-ixp4xx_2.6.23.8.bb
@@ -1,3 +1,7 @@
+# The new ethernet driver included in the 2.6.23 version of the nslu2-linux.org kernel patches
+# has problems with providing the correct MAC address on the initial DHCP request.
+DEFAULT_PREFERENCE = "-1"
+
 require linux.inc
 require linux-ixp4xx.inc
 
@@ -8,7 +12,7 @@ KERNEL_RELEASE = "2.6.23.8"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb
index 77703ad999..704309162c 100644
--- a/packages/linux/linux-linkstationarm_2.6.12.bb
+++ b/packages/linux/linux-linkstationarm_2.6.12.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Linux Kernel for ARM based Buffalo Linkstations"
 SECTION = "kernel"
 LICENSE = "GPL"
+DEPENDS += "u-boot-utils-native"
 PR = "r2"
 
 COMPATIBLE_MACHINE = "lsarm"
diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
index 7a6efb0059..6bcc0d9a06 100644
--- a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
+++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
@@ -3,7 +3,7 @@ SECTION = "kernel"
 LICENSE = "GPL"
 PR = "r0"
 
-DEPENDS = "dtc-native"
+DEPENDS = "dtc-native u-boot-utils-native"
 COMPATIBLE_MACHINE = "(lsppchd|lsppchg)"
 
 SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc
index 83f134b878..52b0d27a6d 100644
--- a/packages/linux/linux-omap.inc
+++ b/packages/linux/linux-omap.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
 #DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']}
 
-DEPENDS = uboot-utils
+DEPENDS = "u-boot-utils-native"
 
 inherit kernel
 
diff --git a/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.23-omap1/binutils-buildid-arm.patch b/packages/linux/linux-omap1-2.6.23-omap1/binutils-buildid-arm.patch
new file mode 100644
index 0000000000..edd224f4dd
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.23-omap1/binutils-buildid-arm.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 5ff5406..538fcb5 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -94,6 +94,7 @@ SECTIONS
+ 			TEXT_TEXT
+ 			SCHED_TEXT
+ 			LOCK_TEXT
++			*(.note.*)
+ #ifdef CONFIG_MMU
+ 			*(.fixup)
+ #endif
diff --git a/packages/linux/linux-omap1-2.6.23-omap1/defconfig b/packages/linux/linux-omap1-2.6.23-omap1/defconfig
new file mode 100644
index 0000000000..88b663c3f5
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.23-omap1/defconfig
@@ -0,0 +1,1098 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-omap1
+# Mon Dec  3 16:40:55 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+CONFIG_ARCH_OMAP=y
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP_OTG=y
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+# CONFIG_ARCH_OMAP3 is not set
+
+#
+# OMAP Feature Selections
+#
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+# CONFIG_OMAP_STI is not set
+CONFIG_OMAP_MCBSP=y
+# CONFIG_OMAP_MMU_FWK is not set
+# CONFIG_OMAP_MBOX_FWK is not set
+# CONFIG_OMAP_MPU_TIMER is not set
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
+CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_SERIAL_WAKE=y
+# CONFIG_OMAP_DSP is not set
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+# CONFIG_ARCH_OMAP15XX is not set
+CONFIG_ARCH_OMAP16XX=y
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_OMAP_H2 is not set
+# CONFIG_MACH_OMAP_H3 is not set
+CONFIG_MACH_OMAP_OSK=y
+CONFIG_OMAP_OSK_MISTRAL=y
+# CONFIG_MACH_NOKIA770 is not set
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_216MHZ is not set
+CONFIG_OMAP_ARM_192MHZ=y
+# CONFIG_OMAP_ARM_168MHZ is not set
+# CONFIG_OMAP_ARM_120MHZ is not set
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_OMAP_ARM_30MHZ is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_OMAP_CF=y
+
+#
+# Kernel Features
+#
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=128
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+# CONFIG_APM_EMULATION is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_OMAP_NOR=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 is not set
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_NET_PCMCIA is not set
+# CONFIG_WAN is not set
+CONFIG_PPP=y
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+# CONFIG_PPP_ASYNC is not set
+# CONFIG_PPP_SYNC_TTY is not set
+# CONFIG_PPP_DEFLATE is not set
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_KEYBOARD_OMAP=y
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_OMAP=m
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+CONFIG_I2C_OMAP=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_ISP1301_OMAP is not set
+CONFIG_TPS65010=y
+# CONFIG_SENSORS_TLV320AIC23 is not set
+# CONFIG_GPIOEXPANDER_OMAP is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_NEW_LEDS is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_OMAP=y
+# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
+# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
+# CONFIG_FB_OMAP_DMA_TUNE is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+CONFIG_HID_DEBUG=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# CBUS support
+#
+# CONFIG_CBUS is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/packages/linux/linux-omap1_2.6.23-omap1.bb b/packages/linux/linux-omap1_2.6.23-omap1.bb
new file mode 100644
index 0000000000..9c6a52e3f9
--- /dev/null
+++ b/packages/linux/linux-omap1_2.6.23-omap1.bb
@@ -0,0 +1,10 @@
+require linux-omap.inc
+
+COMPATIBLE_MACHINE = "omap5912osk"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.23-omap1.bz2;patch=1 \
+           file://binutils-buildid-arm.patch;patch=1 \
+	   file://defconfig"
+
+S = "${WORKDIR}/linux-2.6.23"
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index fc4a547fd7..b659153733 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -1,9 +1,22 @@
 # extra stuff we need for openmoko that is not in linux.inc
-
 do_deploy_append() {
-	mv ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
-	mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
+	mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
+	mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin
 }
 
+RDEPENDS_kernel-image += "mtd-utils"
+
+pkg_postinst_kernel-image () {
+if test "x$D" != "x"; then
+        exit 1
+else
+	echo "Upgrading Kernel in Flash"
+	echo "DO NOT stop this process"
+
+	${bindir}/flash_eraseall ${MTD_KERNEL_PARTITION}
+	${bindir}/nandwrite -p ${MTD_KERNEL_PARTITION} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
+fi
+}
+
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index c623504c73..d1b3c5ef1e 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -37,7 +37,6 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}"
 ##############################################################
 # kernel image resides on a seperate flash partition (for now)
 #
-FILES_kernel-image = ""
 ALLOW_EMPTY = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/linux-rp-2.6.22/defconfig-qemux86 b/packages/linux/linux-rp-2.6.22/defconfig-qemux86
index e9eb83e2dd..bc85c2e657 100644
--- a/packages/linux/linux-rp-2.6.22/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.22/defconfig-qemux86
@@ -307,25 +307,107 @@ CONFIG_NETFILTER=y
 #
 # Core Netfilter Configuration
 #
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=y
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-# CONFIG_IP_NF_CT_PROTO_SCTP is not set
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_NF_AMANDA is not set
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-CONFIG_IP_NF_QUEUE=y
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
 
 #
 # DCCP Configuration (EXPERIMENTAL)
@@ -369,6 +451,15 @@ CONFIG_IP_NF_QUEUE=y
 # CONFIG_IEEE80211 is not set
 
 #
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+
+#
 # Device Drivers
 #
 
@@ -1155,7 +1246,7 @@ CONFIG_SND_AC97_BUS=y
 # CONFIG_SND_CS5535AUDIO is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
-# CONFIG_SND_ENS1370 is not set
+CONFIG_SND_ENS1370=y
 # CONFIG_SND_ENS1371 is not set
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
diff --git a/packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch b/packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch
new file mode 100644
index 0000000000..72211aace2
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.23/pxa2xx_udc_support_inverse_vbus.patch
@@ -0,0 +1,120 @@
+From dbaryshkov@gmail.com Fri Dec  7 00:05:32 2007
+Return-Path: <SRS0=7TBh+psr=Q5=lists.arm.linux.org.uk=linux-arm-kernel-bounces+openembedded=haerwu.biz@haerwu.biz>
+X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on 3080.s.tld.pl
+X-Spam-Level: 
+X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_40,SPF_FAIL 
+	autolearn=disabled version=3.1.7
+Delivered-To: haerwu.biz-marcin@haerwu.biz
+Received: (qmail 3062 invoked by uid 813007); 6 Dec 2007 23:44:39 -0000
+Delivered-To: haerwu.biz-openembedded@haerwu.biz
+Received: (qmail 3048 invoked by uid 813007); 6 Dec 2007 23:44:39 -0000
+X-clamdmail: clamdmail 0.18a
+Received: from zeniv.linux.org.uk (195.92.253.2)
+  by smtp.host4.kei.pl with SMTP; 6 Dec 2007 23:44:38 -0000
+Received: from [2002:4e20:1eda:1:201:3dff:fe00:156] (helo=lists.arm.linux.org.uk)
+	by ZenIV.linux.org.uk with esmtpsa (Exim 4.63 #1 (Red Hat Linux))
+	id 1J0Pts-0004dN-KF; Thu, 06 Dec 2007 23:13:03 +0000
+Received: from localhost ([127.0.0.1] helo=lists.arm.linux.org.uk)
+	by lists.arm.linux.org.uk with esmtp (Exim 4.50)
+	id 1J0Pr7-0000cF-OJ; Thu, 06 Dec 2007 23:10:10 +0000
+Received: from mu-out-0910.google.com ([209.85.134.185])
+	by lists.arm.linux.org.uk with esmtp (Exim 4.50) id 1J0Pn3-0000bt-0E
+	for linux-arm-kernel@lists.arm.linux.org.uk;
+	Thu, 06 Dec 2007 23:06:40 +0000
+Received: by mu-out-0910.google.com with SMTP id i2so13552mue
+	for <linux-arm-kernel@lists.arm.linux.org.uk>;
+	Thu, 06 Dec 2007 15:05:40 -0800 (PST)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
+	h=domainkey-signature:received:received:date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
+	bh=cfa4MUFsOjAsSKDax5Yk97Hu762FByFSAfUQi5KP2cc=;
+	b=aA5uLmMsFBL6uxIQjxwtR4vD/2zBfGHiN/xepdZSggrNmYu0DJ75Q8JsSqzU/z7Vh9hALIiHjCR3WeqlJqZKCBMSrANzpFN4KVunUajamxn85btZMYysQ3YuZI+DUTYPovoZhuPjmT+SUT7RFpOhwKXbs7z9J8DCgodOVS+YwEY=
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
+	h=date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
+	b=oWC1DMK+88t4jXf/5sY2gvSAjKuYypZhUflAHvCNbKYn2iFzpEFoFfjcUgV+lArS06OuT/R4v4Cp87JGK1NLA/uei3fhFZwNsoHcqWkgdsOqp5dSWMZFWCCrO4ODJahoFlnsxoS6OiceJM6EKX8u3RTELEVZEnVl3H2HWM4JJh4=
+Received: by 10.82.107.15 with SMTP id f15mr9802870buc.1196982339522;
+	Thu, 06 Dec 2007 15:05:39 -0800 (PST)
+Received: from doriath.ww600.siemens.net ( [91.122.9.34])
+	by mx.google.com with ESMTPS id 5sm15474nfv.2007.12.06.15.05.37
+	(version=SSLv3 cipher=OTHER); Thu, 06 Dec 2007 15:05:38 -0800 (PST)
+Date: Fri, 7 Dec 2007 02:05:32 +0300
+To: linux-arm-kernel@lists.arm.linux.org.uk
+Message-ID: <20071206230532.GA13332@doriath.ww600.siemens.net>
+MIME-Version: 1.0
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.5.17 (2007-11-01)
+From: Dmitry Baryshkov <dbaryshkov@gmail.com>
+Subject: [PATCH 1/2] pxa2xx_udc_support_inverse_vbus.patch
+X-BeenThere: linux-arm-kernel@lists.arm.linux.org.uk
+X-Mailman-Version: 2.1.5
+Precedence: list
+List-Id: ARM Linux kernel discussions <linux-arm-kernel.lists.arm.linux.org.uk>
+List-Unsubscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
+	<mailto:linux-arm-kernel-request@lists.arm.linux.org.uk?subject=unsubscribe>
+List-Archive: <http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel>
+List-Post: <mailto:linux-arm-kernel@lists.arm.linux.org.uk>
+List-Help: <mailto:linux-arm-kernel-request@lists.arm.linux.org.uk?subject=help>
+List-Subscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
+	<mailto:linux-arm-kernel-request@lists.arm.linux.org.uk?subject=subscribe>
+Sender: linux-arm-kernel-bounces@lists.arm.linux.org.uk
+Errors-To: linux-arm-kernel-bounces+openembedded=haerwu.biz+openembedded=haerwu.biz@lists.arm.linux.org.uk
+X-Length: 5827
+Status: R
+X-Status: NC
+X-KMail-EncryptionState:  
+X-KMail-SignatureState:  
+X-KMail-MDN-Sent:  
+
+Some pxa-based boards (like e.g. tosa) have the VBUS-detection gpio pin
+inverted. I.e. it's low when VBUS is connected and high when
+disconnected. Allow specifiing whether gpio_vbus value is inverted.
+
+Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
+
+Index: linux-test/drivers/usb/gadget/pxa2xx_udc.c
+===================================================================
+--- linux-test.orig/drivers/usb/gadget/pxa2xx_udc.c	2007-12-06 12:41:25.784337009 +0300
++++ linux-test/drivers/usb/gadget/pxa2xx_udc.c	2007-12-06 13:39:33.504345084 +0300
+@@ -125,8 +125,12 @@ static int is_vbus_present(void)
+ {
+ 	struct pxa2xx_udc_mach_info		*mach = the_controller->mach;
+ 
+-	if (mach->gpio_vbus)
+-		return gpio_get_value(mach->gpio_vbus);
++	if (mach->gpio_vbus) {
++		int value = gpio_get_value(mach->gpio_vbus);
++		return mach->gpio_vbus_inverted ?
++			!value :
++			value;
++	}
+ 	if (mach->udc_is_connected)
+ 		return mach->udc_is_connected();
+ 	return 1;
+@@ -1396,6 +1400,9 @@ static irqreturn_t udc_vbus_irq(int irq,
+ 	struct pxa2xx_udc	*dev = _dev;
+ 	int			vbus = gpio_get_value(dev->mach->gpio_vbus);
+ 
++	if (dev->mach->gpio_vbus_inverted)
++		vbus = !vbus;
++
+ 	pxa2xx_udc_vbus_session(&dev->gadget, vbus);
+ 	return IRQ_HANDLED;
+ }
+Index: linux-test/include/asm-arm/mach/udc_pxa2xx.h
+===================================================================
+--- linux-test.orig/include/asm-arm/mach/udc_pxa2xx.h	2007-12-06 12:38:49.872349393 +0300
++++ linux-test/include/asm-arm/mach/udc_pxa2xx.h	2007-12-06 12:41:03.594903549 +0300
+@@ -22,5 +22,6 @@ struct pxa2xx_udc_mach_info {
+ 	 */
+ 	u16	gpio_vbus;			/* high == vbus present */
+ 	u16	gpio_pullup;			/* high == pullup activated */
++	unsigned char gpio_vbus_inverted:1;
+ };
+ 
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php
+
diff --git a/packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch b/packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch
new file mode 100644
index 0000000000..ca98926049
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.23/tosa_udc_use_gpio_vbus.patch
@@ -0,0 +1,100 @@
+From dbaryshkov@gmail.com Fri Dec  7 00:07:07 2007
+Return-Path: <SRS0=x/UTRF0x=Q6=lists.arm.linux.org.uk=linux-arm-kernel-bounces+openembedded=haerwu.biz@haerwu.biz>
+X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on 3073.s.tld.pl
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,SPF_FAIL 
+	autolearn=disabled version=3.1.7
+Delivered-To: haerwu.biz-marcin@haerwu.biz
+Received: (qmail 27813 invoked by uid 813007); 7 Dec 2007 00:02:29 -0000
+Delivered-To: haerwu.biz-openembedded@haerwu.biz
+Received: (qmail 27803 invoked by uid 813007); 7 Dec 2007 00:02:28 -0000
+X-clamdmail: clamdmail 0.18a
+Received: from zeniv.linux.org.uk (195.92.253.2)
+  by smtp.host4.kei.pl with SMTP; 7 Dec 2007 00:02:28 -0000
+Received: from [2002:4e20:1eda:1:201:3dff:fe00:156] (helo=lists.arm.linux.org.uk)
+	by ZenIV.linux.org.uk with esmtpsa (Exim 4.63 #1 (Red Hat Linux))
+	id 1J0Q9g-0005Vf-7a; Thu, 06 Dec 2007 23:29:23 +0000
+Received: from localhost ([127.0.0.1] helo=lists.arm.linux.org.uk)
+	by lists.arm.linux.org.uk with esmtp (Exim 4.50)
+	id 1J0Pvo-0000d6-NY; Thu, 06 Dec 2007 23:15:02 +0000
+Received: from ug-out-1314.google.com ([66.249.92.171])
+	by lists.arm.linux.org.uk with esmtp (Exim 4.50) id 1J0PoR-0000bz-SM
+	for linux-arm-kernel@lists.arm.linux.org.uk;
+	Thu, 06 Dec 2007 23:10:07 +0000
+Received: by ug-out-1314.google.com with SMTP id 29so955850ugc
+	for <linux-arm-kernel@lists.arm.linux.org.uk>;
+	Thu, 06 Dec 2007 15:07:14 -0800 (PST)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
+	h=domainkey-signature:received:received:date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
+	bh=kjQKYxTmbZXtFO0UaAnYmPE6Fk1iyXNHPNOw6H2kP6U=;
+	b=vpDrUZqfbWhRrhxvozaHlI9ZC2UwfZvkqIrEeyX5rmqM9rXJTkm1fQQUJvaw43KzvEmxqPXYvpvHQ663HaRRVtN08xB0t2NcDpTm20QUwznzUbze+c4FPTP+86FQbsfhCck86qmrvfBUoDVD1xS2eVR+MxwI63D3rapCtUNpvvo=
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
+	h=date:to:subject:message-id:mime-version:content-type:content-disposition:user-agent:from;
+	b=D4Cx347bDXn3mf7g77jwn0W3XSXIZh+CiEev1FGhlTeKRZhnM7x1ht4Z+57AiD/dMCrCq8lHqE8Gy0Rv7x7krF2bmUJaiO7HXfxmLWY+msGF2nTymkr1NKsqipQRIVCcEf0ZBKcIrT0dK94QhuP4Ea4Sb/YOfb2YwrJPyNWsISo=
+Received: by 10.78.165.16 with SMTP id n16mr3075565hue.1196982433587;
+	Thu, 06 Dec 2007 15:07:13 -0800 (PST)
+Received: from doriath.ww600.siemens.net ( [91.122.9.34])
+	by mx.google.com with ESMTPS id k5sm5631nfh.2007.12.06.15.07.12
+	(version=SSLv3 cipher=OTHER); Thu, 06 Dec 2007 15:07:12 -0800 (PST)
+Date: Fri, 7 Dec 2007 02:07:07 +0300
+To: linux-arm-kernel@lists.arm.linux.org.uk
+Message-ID: <20071206230707.GA13639@doriath.ww600.siemens.net>
+MIME-Version: 1.0
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.5.17 (2007-11-01)
+From: Dmitry Baryshkov <dbaryshkov@gmail.com>
+Subject: [PATCH 2/2] tosa_udc_use_gpio_vbus.patch
+X-BeenThere: linux-arm-kernel@lists.arm.linux.org.uk
+X-Mailman-Version: 2.1.5
+Precedence: list
+List-Id: ARM Linux kernel discussions <linux-arm-kernel.lists.arm.linux.org.uk>
+List-Unsubscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
+	<mailto:linux-arm-kernel-request@lists.arm.linux.org.uk?subject=unsubscribe>
+List-Archive: <http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel>
+List-Post: <mailto:linux-arm-kernel@lists.arm.linux.org.uk>
+List-Help: <mailto:linux-arm-kernel-request@lists.arm.linux.org.uk?subject=help>
+List-Subscribe: <http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel>,
+	<mailto:linux-arm-kernel-request@lists.arm.linux.org.uk?subject=subscribe>
+Sender: linux-arm-kernel-bounces@lists.arm.linux.org.uk
+Errors-To: linux-arm-kernel-bounces+openembedded=haerwu.biz+openembedded=haerwu.biz@lists.arm.linux.org.uk
+X-Length: 4865
+Status: R
+X-Status: NC
+X-KMail-EncryptionState:  
+X-KMail-SignatureState:  
+X-KMail-MDN-Sent:  
+
+Use gpio_vbus instead of udc_is_connected for udc on tosa.
+
+Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
+
+Index: linux-test/arch/arm/mach-pxa/tosa.c
+===================================================================
+--- linux-test.orig/arch/arm/mach-pxa/tosa.c	2007-12-06 12:43:04.301350179 +0300
++++ linux-test/arch/arm/mach-pxa/tosa.c	2007-12-06 12:47:50.881381650 +0300
+@@ -165,15 +165,10 @@ static void tosa_udc_command(int cmd)
+ 	}
+ }
+ 
+-static int tosa_udc_is_connected(void)
+-{
+-	return ((GPLR(TOSA_GPIO_USB_IN) & GPIO_bit(TOSA_GPIO_USB_IN)) == 0);
+-}
+-
+-
+ static struct pxa2xx_udc_mach_info udc_info __initdata = {
+ 	.udc_command		= tosa_udc_command,
+-	.udc_is_connected	= tosa_udc_is_connected,
++	.gpio_vbus		= TOSA_GPIO_USB_IN,
++	.gpio_vbus_inverted	= 1,
+ };
+ 
+ /*
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php
+
diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index 329cd01217..de898b3f11 100644
--- a/packages/linux/linux-rp_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -1,6 +1,8 @@
 require linux-rp.inc
 
-PR = "r37"
+PR = "r38"
+
+DEFAULT_PREFERENCE_poodle = "99"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index b818b0f3e8..9ee189e50a 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -2,6 +2,9 @@ require linux-rp.inc
 
 PR = "r19"
 
+DEFAULT_PREFERENCE_poodle = "-99"
+DEFAULT_PREFERENCE_collie = "1"
+
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index 2084930192..e388a0c1a4 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -1,8 +1,9 @@
 require linux-rp.inc
 
-PR = "r11"
+PR = "r12"
 
-DEFAULT_PREFERENCE_collie = "1"
+DEFAULT_PREFERENCE_poodle = "-99"
+DEFAULT_PREFERENCE_collie = "-1"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb
index 939e630624..3f5552adae 100644
--- a/packages/linux/linux-rp_2.6.22.bb
+++ b/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,8 @@
 require linux-rp.inc
 
-PR = "r10"
+PR = "r12"
+
+DEFAULT_PREFERENCE_poodle = "-99"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb
index 83077b66b8..53625791a7 100644
--- a/packages/linux/linux-rp_2.6.23.bb
+++ b/packages/linux/linux-rp_2.6.23.bb
@@ -1,9 +1,10 @@
 require linux-rp.inc
 
-PR = "r9"
+PR = "r10"
 
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"
+DEFAULT_PREFERENCE_poodle = "-99"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -122,7 +123,9 @@ SRC_URI_append_tosa = "\
 	   file://arm-dma-coherent.patch;patch=1 \
            file://usb-ohci-hooks-r3.patch;patch=1 \
            file://tmio-ohci-r9.patch;patch=1 \
-	    "
+           file://pxa2xx_udc_support_inverse_vbus.patch;patch=1 \
+           file://tosa_udc_use_gpio_vbus.patch;patch=1 \
+           "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
 SRC_URI_append_htcuniversal ="\
diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
index 84701e4a6a..91080752fc 100644
--- a/packages/linux/linux-turbostation_2.6.20.2.bb
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-DEPENDS = "uboot-utils"
-PR = "r1"
+DEPENDS = "u-boot-utils-native"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "turbostation"
 
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 77920f7f4f..654af193f1 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -4,20 +4,34 @@ LICENSE = "GPL"
 
 inherit kernel
 
-# Not every device needs mkimage to generate a kernel image, but lets make OE a bit more
-# friendly and increase the "Just Works(TM) factor. Building uboot takes only a minute.
-DEPENDS += " u-boot-mkimage-openmoko-native "
+# Add dependency on mkimage for kernels that build a uImage
+
+python __anonymous () {
+
+    import bb
+
+    kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''
+    if kerneltype == 'uImage':
+        depends = bb.data.getVar("DEPENDS", d, 1)
+        depends = "%s u-boot-mkimage-openmoko-native" % depends
+        bb.data.setVar("DEPENDS", depends, d)
+}
 
 
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
 
 # Specify the commandline for your device
 
-#boot from mmc
+# Boot from mmc
 CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
-#boot from nfs
+# Boot from nfs
 #CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0"
 
+# Set the verbosity of kernel messages during runtime
+# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour  
+CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
+CMDLINE_append = " ${CMDLINE_DEBUG} "
+
 do_configure_prepend() {
         echo "" > ${S}/.config
 
@@ -107,7 +121,7 @@ UBOOT_ENTRYPOINT ?= "20008000"
 do_compile_append() {
     if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
         if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
-            ${OBJCOPY} -O binary -R .naote -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+            ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
             uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
             rm -f linux.bin
         else
@@ -120,13 +134,13 @@ do_compile_append() {
     fi
 }
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
 KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
 
         cd ${DEPLOY_DIR_IMAGE}
         rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
diff --git a/packages/linux/linux_2.6.22+2.6.23-rc3.bb b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
index 618b6bf44a..47c3564087 100644
--- a/packages/linux/linux_2.6.22+2.6.23-rc3.bb
+++ b/packages/linux/linux_2.6.22+2.6.23-rc3.bb
@@ -1,7 +1,6 @@
 require linux.inc
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 DEFAULT_PREFERENCE_at91sam9263ek = "1"
 
 BASE_KERNEL_VERSION = "2.6.22"
@@ -19,9 +18,6 @@ SRC_URI_append_kb9202 = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.pat
                         "
 SRC_URI_append_at91sam9263ek = " http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz;patch=1 \
                                "
-SRC_URI_append_alix = "file://geode-mfgpt-support-for-geode-class-machines.patch;patch=1 \
-                       file://geode-mfgpt-clock-event-device-support.patch;patch=1"
-
 
 S = "${WORKDIR}/linux-${BASE_KERNEL_VERSION}"
 
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
new file mode 100644
index 0000000000..a7e9b64887
--- /dev/null
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -0,0 +1,73 @@
+require linux.inc
+
+# Mark archs/machines that this kernel supports
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_alix = "1"
+
+PR = "r2"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.24-rc5.bz2;patch=1 \
+           file://defconfig \
+	   "
+
+S = "${WORKDIR}/linux-2.6.23"
+
+SRC_URI_append_cm-x270 = "\
+	file://0001-cm-x270-match-type.patch;patch=1 \
+	file://0002-ramdisk_load.patch;patch=1 \
+	file://0003-mmcsd_large_cards-r0.patch;patch=1 \
+	file://0004-cm-x270-nand-simplify-name.patch;patch=1 \
+	file://0005-cmx270-pci.patch;patch=1"
+
+CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
+
+FILES_kernel-image_cm-x270 = ""
+
+python do_compulab_image() {
+	import os
+	import os.path
+	import struct
+
+	machine = bb.data.getVar('MACHINE', d, 1)
+	if machine == "cm-x270":
+	    deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1)
+	    kernel_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.bin')
+	    img_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270')
+
+	    fo = open(img_file, 'wb')
+
+	    image_data = open(kernel_file, 'rb').read()
+
+	    # first write size into first 4 bytes
+	    size_s = struct.pack('i', len(image_data))
+
+	    # truncate size if we are running on a 64-bit host
+	    size_s = size_s[:4]
+
+	    fo.write(size_s)
+	    fo.write(image_data)
+	    fo.close()
+
+	    os.chdir(deploy_dir)
+	    link_file = bb.data.expand('${KERNEL_IMAGE_SYMLINK_NAME}', d) + '.cmx270'
+	    img_file = bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270'
+	    try:
+		os.unlink(link_file)
+	    except:
+		pass
+	    os.symlink(img_file, link_file)
+}
+
+do_devicetree_image() {
+        if test -n "${DEVICETREE}" ; then
+            dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
+
+            cd ${DEPLOY_DIR_IMAGE}
+            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+        fi
+}
+
+addtask compulab_image after do_deploy before do_package
+addtask devicetree_image after do_deploy before do_package
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index 897694adca..0b276b4d63 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -7,7 +7,10 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
-PR = "r6"
+DEPENDS_append_mpc8313e-rdb = " dtc-native"
+DEPENDS_append_mpc8323e-rdb = " dtc-native"
+
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 	   file://binutils-buildid-arm.patch;patch=1 \
@@ -38,6 +41,9 @@ SRC_URI_append_mpc8323e-rdb = "\
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
+DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+
 FILES_kernel-image_cm-x270 = ""
 
 python do_compulab_image() {
@@ -75,4 +81,15 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
+do_devicetree_image() {
+        if test -n "${DEVICETREE}" ; then
+            dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
+
+            cd ${DEPLOY_DIR_IMAGE}
+            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+        fi
+}
+
 addtask compulab_image after do_deploy before do_package
+addtask devicetree_image after do_deploy before do_package
diff --git a/packages/linux/mainstone-kernel/mainstone_defconfig b/packages/linux/mainstone-kernel/mainstone_defconfig
index a1c7d97cf8..41abfbfeac 100644
--- a/packages/linux/mainstone-kernel/mainstone_defconfig
+++ b/packages/linux/mainstone-kernel/mainstone_defconfig
@@ -1,74 +1,113 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11
-# Sat Mar  5 10:39:38 2005
+# Linux kernel version: 2.6.18
+# Wed Dec 19 15:51:05 2007
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
-CONFIG_UID16=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
 
 #
 # Loadable module support
 #
 CONFIG_MODULES=y
 # CONFIG_MODULE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
 
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_IOP3XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -76,17 +115,16 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
 
 #
 # Intel PXA2xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
 CONFIG_MACH_MAINSTONE=y
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
 CONFIG_IWMMXT=y
 
@@ -99,7 +137,6 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_MINICACHE=y
 
 #
 # Processor Features
@@ -108,59 +145,255 @@ CONFIG_CPU_MINICACHE=y
 CONFIG_XSCALE_PMU=y
 
 #
-# General setup
+# Bus support
 #
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_XIP_KERNEL is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
 
 #
 # PC-card bridges
 #
+CONFIG_PCMCIA_PXA2XX=m
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 console=ttyS0,115200 mem=64M"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
 
 #
-# At least one math emulation must be selected
+# At least one emulation must be selected
 #
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_LEGACY=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+# CONFIG_IRLAN is not set
+# CONFIG_IRNET is not set
+# CONFIG_IRCOMM is not set
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_PXA_FICP is not set
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+# CONFIG_BT_L2CAP is not set
+# CONFIG_BT_SCO is not set
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIUSB is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
+
+#
+# Device Drivers
+#
 
 #
 # Generic Driver Options
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
-# CONFIG_PM is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="root=/dev/nfs ip=dhcp console=ttyS0,115200 mem=64M"
-CONFIG_LEDS=y
-CONFIG_LEDS_TIMER=y
-CONFIG_LEDS_CPU=y
-CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
-# Parallel port support
+# Connector - unified userspace <-> kernelspace linker
 #
-# CONFIG_PARPORT is not set
+# CONFIG_CONNECTOR is not set
 
 #
 # Memory Technology Devices (MTD)
 #
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -176,6 +409,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -198,6 +432,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
 CONFIG_MTD_CFI_INTELEXT=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_CFI_STAA is not set
@@ -205,6 +440,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
 # CONFIG_MTD_XIP is not set
 
 #
@@ -212,9 +448,10 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_MAINSTONE=y
 # CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_EDB7312 is not set
 # CONFIG_MTD_SHARP_SL is not set
+# CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
@@ -222,7 +459,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
 #
@@ -238,180 +474,189 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_NAND is not set
 
 #
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
 # Plug and Play support
 #
 
 #
 # Block devices
 #
-# CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
+CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
 
 #
-# IO Schedulers
+# ATA/ATAPI/MFM/RLL support
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
 
 #
-# Multi-device support (RAID and LVM)
+# Please see Documentation/ide.txt for help/info on IDE drives
 #
-# CONFIG_MD is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
 
 #
-# Networking support
+# IDE chipset support/bugfixes
 #
-CONFIG_NET=y
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
 
 #
-# Networking options
+# SCSI device support
 #
-# CONFIG_PACKET is not set
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
 
 #
-# SCTP Configuration (EXPERIMENTAL)
+# SCSI support type (disk, tape, CD-ROM)
 #
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
 
 #
-# QoS and/or fair queueing
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
 
 #
-# Network testing
+# SCSI Transport Attributes
 #
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
 
 #
-# Ethernet (10 or 100Mbit)
+# SCSI low-level drivers
 #
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_SMC91X=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DEBUG is not set
 
 #
-# Ethernet (1000 Mbit)
+# PCMCIA SCSI adapter support
 #
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
 
 #
-# Ethernet (10000 Mbit)
+# Multi-device support (RAID and LVM)
 #
+# CONFIG_MD is not set
 
 #
-# Token Ring devices
+# Fusion MPT device support
 #
+# CONFIG_FUSION is not set
 
 #
-# Wireless LAN (non-hamradio)
+# IEEE 1394 (FireWire) support
 #
-# CONFIG_NET_RADIO is not set
 
 #
-# Wan interfaces
+# I2O device support
 #
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
 
 #
-# ATA/ATAPI/MFM/RLL support
+# Network device support
 #
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
 
 #
-# Please see Documentation/ide.txt for help/info on IDE drives
+# PHY device support
 #
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_PHYLIB is not set
 
 #
-# IDE chipset support/bugfixes
+# Ethernet (10 or 100Mbit)
 #
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_SMC91X=y
+# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
 
 #
-# SCSI device support
+# Ethernet (1000 Mbit)
 #
-# CONFIG_SCSI is not set
 
 #
-# Fusion MPT device support
+# Ethernet (10000 Mbit)
 #
 
 #
-# IEEE 1394 (FireWire) support
+# Token Ring devices
 #
 
 #
-# I2O device support
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
 #
+# CONFIG_WAN is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -436,17 +681,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-
-#
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
@@ -461,11 +695,21 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_INPUT_MISC is not set
 
 #
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
 # Character devices
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -482,7 +726,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LEGACY_PTY_COUNT=16
 
 #
 # IPMI
@@ -493,52 +737,333 @@ CONFIG_LEGACY_PTY_COUNT=256
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
 # I2C support
 #
 # CONFIG_I2C is not set
 
 #
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_DEVICE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_TOUCHSCREEN is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_ATI_REMOTE2 is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_DUMMY_HCD=y
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_GADGETFS is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+# CONFIG_USB_G_SERIAL is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_PXA=m
+
+#
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=y
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
 # File systems
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-
-#
-# XFS support
-#
+# CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -560,11 +1085,10 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -579,13 +1103,14 @@ CONFIG_RAMFS=y
 # CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_JFFS2_FS_NOR_ECC is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=m
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -602,6 +1127,7 @@ CONFIG_NFS_FS=y
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -610,6 +1136,7 @@ CONFIG_SUNRPC=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -667,77 +1194,32 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_PROFILING is not set
 
 #
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_PXA=y
-# CONFIG_FB_PXA_PARAMETERS is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# Misc devices
-#
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-
-#
 # Kernel hacking
 #
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_PRINTK_TIME is not set
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_VM is not set
 CONFIG_FRAME_POINTER=y
+# CONFIG_UNWIND_INFO is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_DEBUG_USER=y
 # CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
@@ -753,7 +1235,31 @@ CONFIG_DEBUG_LL=y
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
 
 #
 # Hardware crypto devices
@@ -762,8 +1268,10 @@ CONFIG_DEBUG_LL=y
 #
 # Library routines
 #
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
index f487e1f38a..0e80721489 100644
--- a/packages/linux/mainstone-kernel_2.6.18.bb
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://mainstone_defconfig"
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index b2e903c913..a666d224a9 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
 LICENSE = "GPL"
-PR = "r20"
+PR = "r21"
 
 COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "nslu2"
@@ -38,7 +38,7 @@ S = "${WORKDIR}/linux-2.4.22"
 inherit kernel
 
 ARCH = "arm"
-KERNEL_SUFFIX = "ixp4xxbe"
+KERNEL_SUFFIX = "nslu2be"
 CMDLINE_CONSOLE ?= "ttyS0,115200"
 CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000"
 CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
@@ -52,7 +52,7 @@ do_configure_prepend() {
 
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb
index 3abca0e88a..083e9a6ca1 100644
--- a/packages/lua/lua-gtk2_0.3.bb
+++ b/packages/lua/lua-gtk2_0.3.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "GTK bindings for LUA"
-LICENSE = "GPL2"
+SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 DEPENDS = "gtk+ lua-native perl-native readline libffi"
 RDEPENDS = "lua"
-SECTION = "libs"
 
 inherit gpe
 
diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb
index f0c139da64..1a89a4275c 100644
--- a/packages/lyx/lyx_1.4.1.bb
+++ b/packages/lyx/lyx_1.4.1.bb
@@ -10,7 +10,7 @@ PR = "r1"
 SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_1;rev=13847"
 S = "${WORKDIR}/lyx-1_4_1"
 
-inherit autotools qt3x11
+inherit qt3x11 autotools
 
 EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}"
 PARALLEL_MAKE = ""
diff --git a/packages/lyx/lyx_1.4.4.bb b/packages/lyx/lyx_1.4.4.bb
index d9156cd779..26970a3ed0 100644
--- a/packages/lyx/lyx_1.4.4.bb
+++ b/packages/lyx/lyx_1.4.4.bb
@@ -10,7 +10,7 @@ PR = "r0"
 SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_4;rev=17185"
 S = "${WORKDIR}/lyx-1_4_4"
 
-inherit autotools qt3x11
+inherit qt3x11 autotools
 
 EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}"
 PARALLEL_MAKE = ""
diff --git a/packages/lyx/lyx_1.5.1.bb b/packages/lyx/lyx_1.5.1.bb
index 60c10850b6..32e3096dbe 100644
--- a/packages/lyx/lyx_1.5.1.bb
+++ b/packages/lyx/lyx_1.5.1.bb
@@ -3,15 +3,13 @@ SECTION = "x11/office"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.lyx.org"
 DEPENDS = "boost qt4-x11-free"
-RRECOMMENDS = "tetex"
+RSUGGESTS = "tetex"
 RDEPENDS = "python-shell python-textutils"
 PR = "r0"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "http://lyx.cybermirror.org/stable/lyx-${PV}.tar.bz2"
 
-inherit autotools qt4x11
+inherit qt4x11 autotools
 
 EXTRA_OECONF = " --with-qt4-dir=${QTDIR} -enable-pch"
 EXTRA_QMAKEVARS_POST = "DEFINES+=_LIBC"
diff --git a/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb b/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
index ca40ea572c..8fbf5e3578 100644
--- a/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
+++ b/packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 PR = "r1"
 
-SRC_URI = "http://212.10.30.205/rc12/src/mb-applet-cards-${PV}.tar.bz2 \
+SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/mb-applet-cards-${PV}.tar.bz2 \
 	file://oz-gpe.patch;patch=1 \
 	file://gpe-applet-cards \
 	file://cf_mount.png \
diff --git a/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch b/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch
new file mode 100644
index 0000000000..545d4808d9
--- /dev/null
+++ b/packages/matchbox-applet-inputmanager/files/visibility-protocol.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>"
+# Date 1196333272 -7200
+# Node ID 4ec785864bbe896eda3b933e65a5f2d71864b9b3
+# Parent  375f9e4a30d3de9852b00cd1decb259f4f04446e
+Implement an IM [Unix-]signal-based visibility protocol, as supported
+by xkbd. By receiving SISUSR1, IM implementation toggles its visibility.
+The most valuable, default action for SIGUSR1 is process termination, so
+we can send SIGUSR1 unconditionally, replacing old method of sending
+SIGTERM (and there's also check for process existence before sending
+signal, so if process is dead, it will be just restarted).
+
+diff -r 375f9e4a30d3 -r 4ec785864bbe mbinputmgr.c
+--- a/mbinputmgr.c	Wed Nov 28 03:41:20 2007 +0200
++++ b/mbinputmgr.c	Thu Nov 29 12:47:52 2007 +0200
+@@ -1,3 +1,4 @@
++#include <signal.h>
+ #include "mbinputmgr.h"
+ 
+ static void 
+@@ -233,8 +234,10 @@ mbinputmgr_toggle_selected_method (MBInp
+   if ( (inpmgr->PidCurrent != -1) /* Something running */
+        &&  (kill(inpmgr->PidCurrent, 0) != -1) )
+     {
+-      kill(inpmgr->PidCurrent, 15); /* kill it */
+-      inpmgr->PidCurrent = -1;
++      /* Send a SIGUSR1. Smart IMs will toggle their visibility.
++         Dumb, which don't handle it at all, will just die
++	 per default action for SIGUSR1, termination. */
++      kill(inpmgr->PidCurrent, SIGUSR1);
+     }
+   else fork_exec(inpmgr, inpmgr->MethodSelected->exec);
+ }
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
index 4afdd426db..09f2a7d999 100644
--- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
@@ -3,11 +3,12 @@ LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz \
 	   file://update-to-svn.diff;patch=1 \
            file://mbinputmgr-libgtkinput.patch;patch=1 \
+	   file://visibility-protocol.patch;patch=1 \
 	   "
 
 S = "${WORKDIR}/mb-applet-input-manager-${PV}"
diff --git a/packages/matchbox-desktop-sato/.mtn2git_empty b/packages/matchbox-desktop-sato/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-desktop-sato/.mtn2git_empty
diff --git a/packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb b/packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
new file mode 100644
index 0000000000..8d1a3e181d
--- /dev/null
+++ b/packages/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
@@ -0,0 +1,14 @@
+SECTION = "x11"
+DESCRIPTION = "Sato desktop folders"
+LICENSE = "LGPL"
+DEPENDS = ""
+CONFLICTS = "matchbox-common"
+SRCREV = "76"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=desktop-folders;proto=http"
+S = "${WORKDIR}/desktop-folders"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch
index 3a09ac5bc2..c25aa74ca4 100644
--- a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch
+++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch
@@ -1,12 +1,12 @@
 Index: matchbox-keyboard/src/matchbox-keyboard.c
 ===================================================================
---- matchbox-keyboard.orig/src/matchbox-keyboard.c	2007-08-19 17:26:59.000000000 +0200
-+++ matchbox-keyboard/src/matchbox-keyboard.c	2007-08-19 17:27:06.000000000 +0200
-@@ -52,7 +52,7 @@
+--- matchbox-keyboard.orig/src/matchbox-keyboard.c
++++ matchbox-keyboard/src/matchbox-keyboard.c
+@@ -54,7 +54,7 @@
    kb->row_spacing = 5;
  
    kb->font_family  = strdup("sans");
--  kb->font_pt_size = 5;
+-  kb->font_pt_size = 6;
 +  kb->font_pt_size = 3;
    kb->font_variant = strdup("bold");
  
diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
index 5b6ea4edfa..4384b6db7d 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -1,18 +1,23 @@
 DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
-RCONFLICTS = matchbox-keyboard
-RPROVIDES_${PN} = matchbox-keyboard
-#DEFAULT_PREFERENCE = "-1"
+RCONFLICTS_${PN} = "matchbox-keyboard"
+RPROVIDES_${PN} = "matchbox-keyboard"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r7"
+PR = "r10"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
-	file://smallscreen-fontsize.patch;patch=1 \
-	file://80matchboxkeyboard"
+	    file://smallscreen-fontsize.patch;patch=1 \
+        file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+        file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+        file://4-Add-rendering-debug-logging.patch;patch=1 \
+        file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
+        file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
+	    file://80matchboxkeyboard"
 
 SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1"
+SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1"
 
 S = "${WORKDIR}/matchbox-keyboard"
 
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 27ea4aea1d..696486b6ef 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -5,13 +5,13 @@ RCONFLICTS = matchbox-keyboard-inputmethod
 RPROVIDES_${PN} = matchbox-keyboard-inputmethod
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR="r6"
+PR="r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
            file://smallscreen-fontsize.patch;patch=1 \
-#           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-#           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-#           file://4-Add-rendering-debug-logging.patch;patch=1 \
+           file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+           file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+           file://4-Add-rendering-debug-logging.patch;patch=1 \
            file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
            file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
           "
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
new file mode 100644
index 0000000000..82f6cb50b9
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
@@ -0,0 +1,16 @@
+diff -r cccb513c808c src/interface.c
+--- a/src/interface.c	Wed Nov 28 01:22:54 2007 +0200
++++ b/src/interface.c	Wed Nov 28 01:43:12 2007 +0200
+@@ -93,8 +93,12 @@ static void fill_user_list(GtkListStore 
+  strcpy(linkpath, home_dir);
+  strcat(linkpath, "/");
+  strcat(linkpath, USR_LAYOUT_SUFFIX);
++ if (access(linkpath, X_OK)) {
++    mkdir(linkpath, 0711);
++ }
+  dir = opendir(linkpath);
+  if(!dir) {
++    fprintf(stderr, "Cannot read %s directory: ", linkpath);
+     perror("opendir");
+     exit(1);
+  }
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
new file mode 100644
index 0000000000..d08be372ac
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
new file mode 100644
index 0000000000..095a8d337a
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
@@ -0,0 +1,18 @@
+diff -r a6959d06b0fb mk-layouts-gui.desktop
+--- a/mk-layouts-gui.desktop	Wed Nov 28 02:07:06 2007 +0200
++++ b/mk-layouts-gui.desktop	Wed Nov 28 02:08:49 2007 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Name=MK Layout Manager
+ Comment=Manage matchbox-keyboard layouts
+-Exec=mk-layouts-gui
++Exec=mboxkbd-layouts-gui
+ Type=Application
+-Icon=mk-layouts-gui.png
+-Categories=Application;SystemSettings;MB
+-StartupNotify=True
+-SingleInstance=True
++Icon=mboxkbd-layouts-gui
++Categories=Application;SystemSettings;MB;
++StartupNotify=true
++SingleInstance=true
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
index 2dfba07fc7..6a466a1e9a 100644
--- a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
@@ -3,12 +3,21 @@ AUTHOR = "Sergey Lapin"
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-PR = "r3"
+PR = "r5"
 
-PV = "0.0+git${SRCDATE}"
+PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f"
 
-SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git"
+SRC_URI = "http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz \
+#git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \
+           file://auto-mkdir.patch;patch=1 \
+	   file://sanitize-desktop-file.patch;patch=1 \
+	   file://mboxkbd-layouts-gui.png"
 
 S = "${WORKDIR}/git"
 
 inherit autotools
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/mboxkbd-layouts-gui.png ${D}${datadir}/pixmaps/
+}
diff --git a/packages/matchbox-sato/.mtn2git_empty b/packages/matchbox-sato/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-sato/.mtn2git_empty
diff --git a/packages/matchbox-sato/matchbox-sato/.mtn2git_empty b/packages/matchbox-sato/matchbox-sato/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-sato/matchbox-sato/.mtn2git_empty
diff --git a/packages/matchbox-sato/matchbox-sato/etc/.mtn2git_empty b/packages/matchbox-sato/matchbox-sato/etc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-sato/matchbox-sato/etc/.mtn2git_empty
diff --git a/packages/matchbox-sato/matchbox-sato/etc/matchbox/.mtn2git_empty b/packages/matchbox-sato/matchbox-sato/etc/matchbox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-sato/matchbox-sato/etc/matchbox/.mtn2git_empty
diff --git a/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
new file mode 100755
index 0000000000..8c8f953b47
--- /dev/null
+++ b/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+if [ -e /dev/touchscreen/touchscreen0 ]; then
+    SHOWCURSOR="no"
+else
+    SHOWCURSOR="yes"
+fi
+
+matchbox-desktop &
+
+matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup &
+
+exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
diff --git a/packages/matchbox-sato/matchbox-sato/matchbox-session b/packages/matchbox-sato/matchbox-sato/matchbox-session
new file mode 100644
index 0000000000..65f1ce72ca
--- /dev/null
+++ b/packages/matchbox-sato/matchbox-sato/matchbox-session
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Very simple session manager for matchbox tools
+#
+
+# Uncomment below to enable parsing of debian menu entrys
+# export MB_USE_DEB_MENUS=1 
+
+if [ -e $HOME/.matchbox/session ]
+then
+exec $HOME/.matchbox/session
+fi
+
+if [ -e /etc/matchbox/session ]
+then
+exec /etc/matchbox/session
+fi
+
+# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
+# dont exist. 
+
+matchbox-desktop &
+matchbox-panel  --orientation south &
+exec matchbox-window-manager $@
diff --git a/packages/matchbox-sato/matchbox-sato_0.1.bb b/packages/matchbox-sato/matchbox-sato_0.1.bb
new file mode 100644
index 0000000000..b622f24586
--- /dev/null
+++ b/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Custom MB session files for poky"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS = "gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
+RCONFLICTS = "matchbox-common"
+PR = "r17"
+
+SRC_URI = "file://etc file://matchbox-session"
+S = ${WORKDIR}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
+	cp -R ${S}/etc ${D}/etc
+	rm -fR ${D}/etc/.svn
+	rm -fR ${D}/etc/matchbox/.svn
+	chmod -R 755 ${D}/etc
+}
+
+pkg_postinst_matchbox-sato () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
+}
diff --git a/packages/mesa/mesa-7.0.2/.mtn2git_empty b/packages/mesa/mesa-7.0.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mesa/mesa-7.0.2/.mtn2git_empty
diff --git a/packages/mesa/mesa-7.0.2/fix-host-compile.patch b/packages/mesa/mesa-7.0.2/fix-host-compile.patch
new file mode 100644
index 0000000000..d24d03d379
--- /dev/null
+++ b/packages/mesa/mesa-7.0.2/fix-host-compile.patch
@@ -0,0 +1,30 @@
+--- /src/mesa/x86/orig-Makefile	2005-07-01 04:54:38.000000000 +0300
++++ /src/mesa/x86/Makefile	2007-06-07 21:52:31.000000000 +0300
+@@ -5,6 +5,7 @@
+ 
+ 
+ INCLUDE_DIRS = \
++        -I/usr/include \
+ 	-I$(TOP)/include/GL \
+ 	-I$(TOP)/include \
+ 	-I.. \
+@@ -13,6 +14,10 @@
+ 	-I../glapi \
+ 	-I../tnl
+ 
++OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
++
++CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \
++        $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
+ 
+ default: gen_matypes matypes.h
+ 
+@@ -21,7 +26,7 @@
+ 
+ 
+ gen_matypes: gen_matypes.c
+-	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
++	$(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes
+ 
+ # need some special rules here, unfortunately
+ matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch b/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
new file mode 100644
index 0000000000..618f5b57ed
--- /dev/null
+++ b/packages/mesa/mesa-7.0.2/mklib-rpath-link.patch
@@ -0,0 +1,23 @@
+--- /tmp/mklib	2007-12-08 11:03:23.000000000 +0100
++++ Mesa-7.0.2/bin/mklib	2007-12-08 11:04:02.509863000 +0100
+@@ -106,6 +106,9 @@
+ 	-L*)
+ 	    DEPS="$DEPS $1"
+ 	    ;;
++        -Wl*)
++            DEPS="$DEPS $1"
++            ;;
+ 	-pthread)
+ 	    # this is a special case (see bugzilla 10876)
+ 	    DEPS="$DEPS $1"
+--- /tmp/default	2007-12-08 11:04:17.000000000 +0100
++++ Mesa-7.0.2/configs/default	2007-12-08 11:05:06.279863000 +0100
+@@ -76,7 +76,7 @@
+ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+ 
+ # Program dependencies - specific GL/glut libraries added in Makefiles
+-APP_LIB_DEPS = -lm
++APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm
+ 
+ 
+ 
diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb
index 9255a926e9..fffbfee780 100644
--- a/packages/mesa/mesa-dri_6.5.2.bb
+++ b/packages/mesa/mesa-dri_6.5.2.bb
@@ -4,9 +4,11 @@ FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libdrm"
+# DRI is useless without the kernel drivers
+RRECOMMENDS += " kernel-module-drm kernel-module-radeon "
 
 do_configure() {
 	cd configs
diff --git a/packages/mesa/mesa_7.0.2.bb b/packages/mesa/mesa_7.0.2.bb
new file mode 100644
index 0000000000..3eb1fbef8b
--- /dev/null
+++ b/packages/mesa/mesa_7.0.2.bb
@@ -0,0 +1,6 @@
+include mesa-mesa.inc
+
+SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+
+
+
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
new file mode 100644
index 0000000000..c483ea26a6
--- /dev/null
+++ b/packages/meta/external-toolchain.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "This package allows OE to work with an external toolchain generated \
+               by meta-toolchain instead of building its own. It expects that toolchain \
+               to be located in SDK_PREFIX/prefix."
+
+PROVIDES = "\
+    linux-libc-headers \
+    virtual/${TARGET_PREFIX}gcc \
+    virtual/${TARGET_PREFIX}gcc-initial \
+    virtual/${TARGET_PREFIX}binutils \
+    virtual/${TARGET_PREFIX}libc-for-gcc \
+    virtual/libc \
+    virtual/libintl \
+    virtual/libiconv \
+    glibc-thread-db \
+    virtual/linux-libc-headers \
+    "
+
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+PR = "r1"
+
+inherit sdk
+
+do_stage() {
+	if [ ! -e  ${prefix}/package-status ]; then
+		echo "The external toolchain could not be found in ${prefix}!"
+		exit 1
+	fi
+	
+	install -d ${STAGING_DIR}/pkgdata/
+	install -d ${STAGING_DIR_TARGET}/shlibs/
+
+	cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
+	cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
+
+	if [ -d ${prefix}/ipk ]; then
+		install -d ${DEPLOY_DIR_IPK}/
+		cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/
+	fi
+
+	if [ -d ${prefix}/deb ]; then
+		install -d ${DEPLOY_DIR_DEB}/
+		cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/
+	fi
+
+	if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then
+		install -d ${DEPLOY_DIR_PSTAGE}/
+		cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/
+	fi
+}
diff --git a/packages/meta/meta-angstrom-2007.bb b/packages/meta/meta-angstrom-2007.bb
new file mode 100644
index 0000000000..a3a2c78a79
--- /dev/null
+++ b/packages/meta/meta-angstrom-2007.bb
@@ -0,0 +1,32 @@
+# Meta file to inform the autobuilder which packages to build for the feeds
+# Any changes should be discussed first on the angstrom-distro-devel mailinglist
+
+# Try to keep it alphabetically sorted please
+ 
+inherit meta
+
+RDEPENDS = ""
+
+# Basic tools
+RDEPENDS += " \
+         task-proper-tools \
+	 screen \
+	 "
+
+# Browsers know to work on all archs
+RDEPENDS += " \
+         gpe-mini-browser \
+         midori \
+	 minimo \
+         openmoko-browser2 \
+	 webkit-gtklauncher \
+         "
+
+# Webservers
+RDEPENDS += " \
+        apache2 \
+        boa \
+	cherokee \
+	lighttpd \
+	thttpd \
+	"
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 92fded00af..91467e5140 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -8,6 +8,8 @@ SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
+FEED_ARCH ?= "${TARGET_ARCH}"
+
 IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
 IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
 
@@ -62,18 +64,18 @@ do_populate_sdk() {
 	mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
 	rm -Rf ${SDK_OUTPUT}/usr/lib
 
-	# extract and store ipks, pkgdata, pkgmaps and shlibs data
+	# extract and store ipks, pkgdata and shlibs data
 	target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '`
 	mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/
 	mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/
-	mkdir -p ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
 	for pkg in $target_pkgs ; do
 		for arch in $revipkgarchs; do
-			if [ -e ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ]; then
-				echo "Found ${DEPLOY_DIR_IPK}/$arch/${pkg}_$arch.ipk"
-				cp ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/
-				orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2`
+			pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
+			if [ -e $pkgnames ]; then
+				echo "Found $pkgnames"
+				cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
+				orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
 				pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
 				mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
 				cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
@@ -83,9 +85,6 @@ do_populate_sdk() {
 					if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then
 						cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/
 					fi
-					if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then
-						cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/
-					fi
 					if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
 						cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
 					fi
@@ -97,6 +96,8 @@ do_populate_sdk() {
 
 	# add missing link to libgcc_s.so.1
 	# libgcc-dev should be responsible for that, but it's not getting built
+	# RP: it gets smashed up depending on the order that gcc, gcc-cross and 
+	# gcc-cross-sdk get built :( (30/11/07)
 	ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
 
 	# remove unwanted executables
@@ -119,7 +120,7 @@ do_populate_sdk() {
 	# package it up
 	mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}
-	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
+	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
 }
 
 do_populate_sdk[nostamp] = "1"
diff --git a/packages/meta/nylon-feed.inc b/packages/meta/nylon-feed.inc
index de1a7ff484..d7b83e8edb 100644
--- a/packages/meta/nylon-feed.inc
+++ b/packages/meta/nylon-feed.inc
@@ -54,7 +54,7 @@ sysvinit \
 tcl \
 tcpdump \
 tinc \
-timezones \
+tzdata \
 usbutils \
 vtun \
 wireless-tools \
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index afff86639a..3df2f5e3b2 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter"
 HOMEPAGE = "http://www.openprotium.org"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 CONFLICTS = "db3"
 PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
 
@@ -234,7 +234,7 @@ SLUGOS_PACKAGES_append_linux = "\
 	man man-pages \
 	psmisc \
 	screen \
-	timezones \
+	tzdata \
         wview-sim wview-vpro wview-wxt510 \
         wview-sim-mysql wview-vpro-mysql \
         wview-wxt510-mysql \
diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb
index 62513c11cd..190f323838 100644
--- a/packages/meta/oplinux-packages.bb
+++ b/packages/meta/oplinux-packages.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Packages that are compatible with the OPLinux distro"
 HOMEPAGE = "http://www.digital-opsis/oplinux"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 PROVIDES += "${OPLINUX_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
@@ -359,7 +359,7 @@ PACKAGES_LIST = "\
 	man man-pages \
 	psmisc \
 	screen \
-	timezones \
+	tzdata \
         wview-sim wview-vpro wview-wxt510 \
         wview-sim-mysql wview-vpro-mysql \
         wview-wxt510-mysql \
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index e914865e9b..c007899afd 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r42"
+PR = "r43"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -196,7 +196,6 @@ SLUGOS_PACKAGES = "\
 	tar \
 	thttpd \
 	tiff \
-	timezones \
 	tzdata \
 	unzip \
 	upslug2 \
diff --git a/packages/mipl-mipv6/mipv6_2.0.2.bb b/packages/mipl-mipv6/mipv6_2.0.2.bb
new file mode 100644
index 0000000000..8bbcb4cb75
--- /dev/null
+++ b/packages/mipl-mipv6/mipv6_2.0.2.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+RRECOMMENDS = "kernel-module-mip6 kernel-module-ipv6"
+
+SRC_URI = "http://www.mobile-ipv6.org/software/download/mipv6-${PV}.tar.gz"
+
+inherit autotools module-base
+
+CFLAGS =+ "-I${S}/include -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+        oe_runmake CFLAGS="${CFLAGS}"
+}
+
+do_install() {
+        install -d ${D}${sbindir}
+        install -d ${D}${sysconfdir}/init.d
+        oe_runmake sbindir="${D}${sbindir}" initdir="${D}${sysconfdir}/init.d" mandir="${D}${mandir}" docdir="${D}${docdir}/mobile-ip6" NETWORK_MIP6_CONF="${D}${sysconfdir}" install
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
diff --git a/packages/mono/files/mono-libgc-configure.patch b/packages/mono/files/mono-libgc-configure.patch
new file mode 100644
index 0000000000..641635da3c
--- /dev/null
+++ b/packages/mono/files/mono-libgc-configure.patch
@@ -0,0 +1,20 @@
+Index: mono-1.2.6/libgc/configure.in
+===================================================================
+--- mono-1.2.6.orig/libgc/configure.in	2007-12-12 15:02:31.000000000 -0500
++++ mono-1.2.6/libgc/configure.in	2007-12-12 15:05:10.000000000 -0500
+@@ -17,6 +17,15 @@
+ AC_PREREQ(2.53)
+ AC_INIT(libgc-mono, 6.6, Hans_Boehm@hp.com)
+ 
++# the following is a very strange bug.  CPPFLAGS does not get set correctly
++# if CPPFLAGS is set in the environment.  The top level configure script
++# appends to the CPPFLAGS variable, and then exports it.  This change should
++# be picked up by this configure script, but it is not.  The original 
++# env variable is still used for some reason.  If CPPFLAGS is not set in the
++# environment, everything works fine.
++# Someone more experienced with autoconf will have to come up with a better fix.
++CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP  -DUSE_COMPILER_TLS"
++echo "CPPFLAGS verify: start of libgc/configure.in, CPPFLAGS = $CPPFLAGS"
+ AM_INIT_AUTOMAKE(libgc-mono, 6.6, no-define)
+ 
+ AC_CONFIG_SRCDIR(gcj_mlc.c)
diff --git a/packages/mono/mono-1.2.6/.mtn2git_empty b/packages/mono/mono-1.2.6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mono/mono-1.2.6/.mtn2git_empty
diff --git a/packages/mono/mono-1.2.6/configure.patch b/packages/mono/mono-1.2.6/configure.patch
new file mode 100644
index 0000000000..f033248621
--- /dev/null
+++ b/packages/mono/mono-1.2.6/configure.patch
@@ -0,0 +1,23 @@
+Index: mono-1.2.6/configure.in
+===================================================================
+--- mono-1.2.6.orig/configure.in	2007-11-08 17:07:57.000000000 -0500
++++ mono-1.2.6/configure.in	2007-12-12 15:27:52.000000000 -0500
+@@ -1150,6 +1150,8 @@
+ 		], [
+ 				AC_MSG_RESULT(no)
+ 				with_tls=pthread
++		], [
++				AC_MSG_RESULT(yes)
+ 		])
+ 	fi
+ 
+@@ -1252,6 +1254,9 @@
+ 		], [
+ 				with_sigaltstack=no
+ 				AC_MSG_RESULT(no)
++		], [
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ 		])
+ 	fi
+ 
diff --git a/packages/mono/mono-mcs-intermediate_1.2.6.bb b/packages/mono/mono-mcs-intermediate_1.2.6.bb
new file mode 100644
index 0000000000..53ff1b25aa
--- /dev/null
+++ b/packages/mono/mono-mcs-intermediate_1.2.6.bb
@@ -0,0 +1,10 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.2.6.inc
+require mono-mcs-intermediate.inc
+
diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb
new file mode 100644
index 0000000000..5c5d8476bb
--- /dev/null
+++ b/packages/mono/mono_1.2.6.bb
@@ -0,0 +1,78 @@
+require mono_1.2.6.inc
+
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
+
+PR = "r1"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
+do_install_append() {
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+}
+
+inherit mono
+
+# Import file definitions from Debian
+require mono_1.2.5.1-files.inc
+
+# Add some packages
+PACKAGES_append = " mono-doc mono mono-runtime"
+
+FILES_mono-doc_append = " /usr/share/libgc-mono/ "
+
+FILES_mono = ""
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
+
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+# Packages not included in Debian
+PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
+	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
+	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
+
+FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
+FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
+FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
+
+FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
+FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
+
+FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
+FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
+
+# Move .pc files
+FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
+PACKAGES =+ " libmono-cairo1.0-cil-dev "
diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc
new file mode 100644
index 0000000000..c9644cbce5
--- /dev/null
+++ b/packages/mono/mono_1.2.6.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \
+	   file://mono-libgc-configure.patch;patch=1"
+
+S = "${WORKDIR}/mono-1.2.6"
+
+inherit autotools
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
diff --git a/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch b/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch
new file mode 100644
index 0000000000..28bffd1e22
--- /dev/null
+++ b/packages/mozilla/firefox-2.0.0.3/linkage-problem.patch
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~	2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in	2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++		    $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
diff --git a/packages/mozilla/firefox-2.0.0.3/mozconfig b/packages/mozilla/firefox-2.0.0.3/mozconfig
index 9737330a77..96caace6bb 100644
--- a/packages/mozilla/firefox-2.0.0.3/mozconfig
+++ b/packages/mozilla/firefox-2.0.0.3/mozconfig
@@ -55,3 +55,6 @@ ac_add_options --enable-image-decoders=png,gif,jpeg
 #ac_add_options --disable-shared
 #ac_add_options --enable-static
 ac_add_options --enable-optimize=-O1
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb
index ede30a6b05..e1fb5a996d 100644
--- a/packages/mozilla/firefox_2.0.0.3.bb
+++ b/packages/mozilla/firefox_2.0.0.3.bb
@@ -1,17 +1,22 @@
-PR = "r2"
+DEPENDS += "cairo"
+PR = "r3"
+
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://jsautocfg.h \
 	file://extensions-hack.patch;patch=1 \
-    file://security-cross.patch;patch=1 \
-    file://jsautocfg-dontoverwrite.patch;patch=1 \
-    file://xptcinvoke-arm.patch;patch=1 \
-    file://eabi-fix.patch;patch=1 \
-    file://eabi-fix2.patch;patch=1 \
-    file://eabi-fix3.patch;patch=1 \
+        file://security-cross.patch;patch=1 \
+        file://jsautocfg-dontoverwrite.patch;patch=1 \
+        file://xptcinvoke-arm.patch;patch=1 \
+        file://eabi-fix.patch;patch=1 \
+        file://eabi-fix2.patch;patch=1 \
+        file://eabi-fix3.patch;patch=1 \
+        file://linkage-problem.patch;patch=1 \
        "
+
 S = "${WORKDIR}/mozilla"
+
 DEFAULT_PREFERENCE = "-1"
 
 inherit mozilla
@@ -36,4 +41,3 @@ do_stage() {
         # removes 2 lines that call absent headers
         sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h
 }
-
diff --git a/packages/mozilla/mozilla/.mtn2git_empty b/packages/mozilla/mozilla/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/files/.mtn2git_empty b/packages/mozilla/mozilla/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/files/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/files/i386/.mtn2git_empty b/packages/mozilla/mozilla/files/i386/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i386/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/files/i386/jsautocfg.h b/packages/mozilla/mozilla/files/i386/jsautocfg.h
new file mode 100644
index 0000000000..7e8171fc23
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i386/jsautocfg.h
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/mozilla/files/i486/.mtn2git_empty b/packages/mozilla/mozilla/files/i486/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i486/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/files/i486/jsautocfg.h b/packages/mozilla/mozilla/files/i486/jsautocfg.h
new file mode 100644
index 0000000000..7e8171fc23
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i486/jsautocfg.h
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/mozilla/files/i586/.mtn2git_empty b/packages/mozilla/mozilla/files/i586/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i586/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/files/i586/jsautocfg.h b/packages/mozilla/mozilla/files/i586/jsautocfg.h
new file mode 100644
index 0000000000..7e8171fc23
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i586/jsautocfg.h
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/mozilla/files/i686/.mtn2git_empty b/packages/mozilla/mozilla/files/i686/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i686/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/files/i686/jsautocfg.h b/packages/mozilla/mozilla/files/i686/jsautocfg.h
new file mode 100644
index 0000000000..7e8171fc23
--- /dev/null
+++ b/packages/mozilla/mozilla/files/i686/jsautocfg.h
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
diff --git a/packages/mozilla/mozilla/firefox-2.0.0.3/.mtn2git_empty b/packages/mozilla/mozilla/firefox-2.0.0.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mozilla/mozilla/firefox-2.0.0.3/.mtn2git_empty
diff --git a/packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch b/packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch
new file mode 100644
index 0000000000..28bffd1e22
--- /dev/null
+++ b/packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~	2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in	2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++		    $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb
index 9a81bc8f00..83f9dac0e3 100644
--- a/packages/mysql/mysql-native_4.1.18.bb
+++ b/packages/mysql/mysql-native_4.1.18.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 require mysql_${PV}.bb
 inherit native
-PR="r3"
+PR="r4"
 
 RDEPENDS_${PN} = ""
 
@@ -17,3 +17,9 @@ do_stage_append() {
 do_install() {
 	:
 }
+
+
+# Mysql tries to access the ${WORKDIR} from this build..
+do_rm_work() {
+       :
+}
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index 17fa33ac1c..b509b81311 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -23,6 +23,7 @@ INITSCRIPT_PACKAGES = "mysql-server"
 INITSCRIPT_NAME = "mysqld"
 INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
 
+PARALLEL_MAKE = " "
 EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
 
diff --git a/packages/ncurses/ncurses/visibility.patch b/packages/ncurses/ncurses/visibility.patch
index 29cac5f1b8..66366ce3ea 100644
--- a/packages/ncurses/ncurses/visibility.patch
+++ b/packages/ncurses/ncurses/visibility.patch
@@ -2187,14 +2187,14 @@
 +	CPPFLAGS="-I\$(srcdir)/../include $CPPFLAGS"
 +fi
 +if test "$GCC" != yes; then
-+	CPPFLAGS="$CPPFLAGS -I\$(includedir)"
++	CPPFLAGS="$CPPFLAGS"
 +elif test "$includedir" != "/usr/include"; then
 +	if test "$includedir" = '${prefix}/include' ; then
 +		if test $prefix != /usr ; then
-+			CPPFLAGS="$CPPFLAGS -I\$(includedir)"
++			CPPFLAGS="$CPPFLAGS"
 +		fi
 +	else
-+		CPPFLAGS="$CPPFLAGS -I\$(includedir)"
++		CPPFLAGS="$CPPFLAGS"
 +	fi
 +fi
 +AC_SUBST(CPPFLAGS)
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 6da32232af..ac125bf6fe 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 	   file://visibility.patch;patch=1"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index 6d13d092c1..52af4ad273 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -2,12 +2,12 @@ SECTION = "base"
 PACKAGES = ""
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
 
-COMPATIBLE_MACHINE = "nslu2"
+COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
 do_compile () {
 	install -d ${STAGING_LIBDIR}/nslu2-binaries
diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.19.bb
index 5473e0d99e..b92a181754 100644
--- a/packages/octave/octave_2.9.17.bb
+++ b/packages/octave/octave_2.9.19.bb
@@ -11,15 +11,15 @@ PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 
 FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
 FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
-FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*"
+FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
 
 FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
 FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
-FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*"
+FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
 
 FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
 FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
-FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
 
 # octave-oct provides subroutines in .oct file format
 FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
diff --git a/packages/openmoko-spaces/.mtn2git_empty b/packages/openmoko-spaces/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-spaces/.mtn2git_empty
diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
new file mode 100644
index 0000000000..1526cbab55
--- /dev/null
+++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
+PACKAGE_ARCH = "all"
+
+SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http"
+SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http"
+
+SRCREV="3630"
+FILES_${PN} = "/"
+
+do_install () {
+	(find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true
+	install -m 755 -d ${D}/share
+	cp -dr ${WORKDIR}/toolkit/* ${D}
+	cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share
+}
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 5d2683e0fd..c5e6d269d7 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
-DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
+DEPENDS = "libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 PE = "1"
 
 inherit openmoko2
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index 9358508cb0..b8dca0c278 100644
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -3,9 +3,8 @@ Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
 LICENSE = "BSD"
-DEPENDS += "openssl"
-DEPENDS = "timezones"
-PR = "r13"
+DEPENDS += "openssl tzdata"
+PR = "r14"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
diff --git a/packages/openntpd/openntpd_3.9p1.bb b/packages/openntpd/openntpd_3.9p1.bb
index 03369fd525..3798c13194 100644
--- a/packages/openntpd/openntpd_3.9p1.bb
+++ b/packages/openntpd/openntpd_3.9p1.bb
@@ -3,9 +3,8 @@ Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
 LICENSE = "BSD"
-DEPENDS += "openssl"
-DEPENDS = "timezones"
-PR = "r0"
+DEPENDS += "openssl tzdata"
+PR = "r1"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/${P}.tar.gz \
            file://adjtimex-${PV}.patch;patch=1 \
diff --git a/packages/openrdate/.mtn2git_empty b/packages/openrdate/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openrdate/.mtn2git_empty
diff --git a/packages/openrdate/openrdate_1.1.3.bb b/packages/openrdate/openrdate_1.1.3.bb
new file mode 100644
index 0000000000..265f4191f2
--- /dev/null
+++ b/packages/openrdate/openrdate_1.1.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Date and time setting software implementing RFC 868 and RFC 2030 protocols"
+HOMEPAGE = "http://sourceforge.net/projects/openrdate/"
+SECTION = "admin"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openrdate/openrdate-${PV}.tar.gz"
+
+inherit autotools
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/opie-citytime/opie-citytime.inc b/packages/opie-citytime/opie-citytime.inc
index a2fe0972af..529eba0d7f 100644
--- a/packages/opie-citytime/opie-citytime.inc
+++ b/packages/opie-citytime/opie-citytime.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Opie Time-zone / world clock settings"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 LICENSE = "GPL"
-RRECOMMENDS = "timezones"
+RRECOMMENDS = "tzdata"
+PR = "r1"
 
 APPNAME = "citytime"
 
diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb
index 46ce6512ca..dd502a8f63 100644
--- a/packages/perl/libxml-parser-perl_2.34.bb
+++ b/packages/perl/libxml-parser-perl_2.34.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 LICENSE = "Artistic"
-DEPENDS += "expat-native"
-PR = "r10"
+DEPENDS += "expat expat-native"
+PR = "r11"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
 
diff --git a/packages/pimlico/contacts-0.8/.mtn2git_empty b/packages/pimlico/contacts-0.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pimlico/contacts-0.8/.mtn2git_empty
diff --git a/packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch b/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
index 1fbf1dcc2a..1fbf1dcc2a 100644
--- a/packages/pimlico/contacts-0.7/contacts-owl-window-menu.patch
+++ b/packages/pimlico/contacts-0.8/contacts-owl-window-menu.patch
diff --git a/packages/pimlico/contacts.inc b/packages/pimlico/contacts.inc
index 5fa493fab3..6baab5e306 100644
--- a/packages/pimlico/contacts.inc
+++ b/packages/pimlico/contacts.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Address-book application."
 LICENSE = "LGPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
+DEPENDS = "glib-2.0 gtk+ eds-dbus libowl"
 RDEPENDS = "libedata-book"
 
 inherit autotools pkgconfig
diff --git a/packages/pimlico/contacts_0.7.bb b/packages/pimlico/contacts_0.8.bb
index d596d45659..d596d45659 100644
--- a/packages/pimlico/contacts_0.7.bb
+++ b/packages/pimlico/contacts_0.8.bb
diff --git a/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb
index 90a37287d1..0257046e88 100644
--- a/packages/pimlico/contacts_svn.bb
+++ b/packages/pimlico/contacts_svn.bb
@@ -4,9 +4,9 @@ require contacts.inc
 #RDEPENDS += "gnome-vfs-plugin-file"
 #RRECOMMENDS += "gnome-vfs-plugin-http"
 
-PV = "0.5+svnr${SRCREV}"
+PV = "0.8+svnr${SRCREV}"
 
-#DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
 	   file://stock_contact.png \
diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
index 4c1e771ba8..40a88ea5c0 100644
--- a/packages/pimlico/dates.inc
+++ b/packages/pimlico/dates.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dates is a calendar application."
 LICENSE = "LGPL"
 SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus libowl"
 RDEPENDS = "libedata-cal"
 
 inherit autotools pkgconfig gtk-icon-cache
diff --git a/packages/pimlico/dates_0.4.4.bb b/packages/pimlico/dates_0.4.5.bb
index 9e5451f522..9e5451f522 100644
--- a/packages/pimlico/dates_0.4.4.bb
+++ b/packages/pimlico/dates_0.4.5.bb
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index d392031abb..0ba1b07dc0 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -2,7 +2,7 @@ require dates.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.4.4+svnr${SRCREV}"
+PV = "0.4.5+svnr${SRCREV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
diff --git a/packages/pimlico/files/dates-owl-window-menu.patch b/packages/pimlico/files/dates-owl-window-menu.patch
index d47875dd65..6bde252ac3 100644
--- a/packages/pimlico/files/dates-owl-window-menu.patch
+++ b/packages/pimlico/files/dates-owl-window-menu.patch
@@ -1,21 +1,30 @@
-Index: trunk/src/Makefile.am
-===================================================================
---- trunk.orig/src/Makefile.am	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/Makefile.am	2007-07-13 08:21:11.000000000 +0100
-@@ -47,7 +47,7 @@
- libgtkdatesviewinclude_HEADERS = \
- 	dates_view.h
+---
+ src/Makefile.am      |    2 +-
+ src/dates_gtk.c      |    5 -----
+ src/dates_main.c     |    5 +++++
+ src/dates_platform.h |    2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+--- dates-0.4.5.orig/src/Makefile.am
++++ dates-0.4.5/src/Makefile.am
+@@ -33,11 +33,11 @@ dates_SOURCES = $(platform) 	\
+ 	dates_callbacks.h 	\
+ 	dates_callbacks.c 	\
+ 	gconf-bridge.h		\
+ 	gconf-bridge.c
  
--dates_LDADD   = $(DATES_LIBS) libgtkdatesview.la
-+dates_LDADD   = $(DATES_LIBS) libgtkdatesview.la -lowl
+-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
++dates_LDADD = $(DATES_LIBS) libgtkdatesview.la -lowl
  
  if USE_OWL
  dates_LDADD += $(top_builddir)/libowl/libowl.la
-Index: trunk/src/dates_gtk.c
-===================================================================
---- trunk.orig/src/dates_gtk.c	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_gtk.c	2007-07-13 08:33:48.000000000 +0100
-@@ -32,10 +32,6 @@
+ endif 
+ 
+--- dates-0.4.5.orig/src/dates_gtk.c
++++ dates-0.4.5/src/dates_gtk.c
+@@ -30,14 +30,10 @@
+ #ifdef WITH_HILDON
+ #include <hildon/hildon-color-button.h>
  #endif
  
  #ifndef DATES_PLATFORM_create_main_window
@@ -26,7 +35,11 @@ Index: trunk/src/dates_gtk.c
  static GtkWidget *
  create_main_window (DatesData * d, GtkWidget * toolbar,
  					GtkWidget * menu, GtkAccelGroup * accel_group)
-@@ -57,7 +53,6 @@
+ {
+ 	GtkWidget *main_vbox;
+@@ -55,11 +51,10 @@ create_main_window (DatesData * d, GtkWi
+ 	main_vbox = gtk_vbox_new (FALSE, 0);
+ 	gtk_widget_show (main_vbox);
  	gtk_container_add (GTK_CONTAINER (d->main_window), main_vbox);
  
  	gtk_widget_show (menu);
@@ -34,24 +47,13 @@ Index: trunk/src/dates_gtk.c
  
  	gtk_box_pack_end (GTK_BOX (main_vbox), toolbar, FALSE, FALSE, 0);
  	gtk_container_set_border_width (GTK_CONTAINER (toolbar), 3);
-Index: trunk/src/dates_platform.h
-===================================================================
---- trunk.orig/src/dates_platform.h	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_platform.h	2007-07-13 08:21:11.000000000 +0100
-@@ -20,7 +20,7 @@
  
- #include "dates_types.h"
  
--#ifdef WITH_HILDON
-+#if 1
- #define DATES_MENU_WITHOUT_BAR 1
- #endif
- 
-Index: trunk/src/dates_main.c
-===================================================================
---- trunk.orig/src/dates_main.c	2007-07-11 22:16:15.000000000 +0100
-+++ trunk/src/dates_main.c	2007-07-13 08:36:11.000000000 +0100
-@@ -25,6 +25,8 @@
+--- dates-0.4.5.orig/src/dates_main.c
++++ dates-0.4.5/src/dates_main.c
+@@ -23,10 +23,12 @@
+ #include <math.h>
+ #include <libecal/e-cal-time-util.h>
  #include <libical/icaltime.h>
  #include <gconf/gconf-client.h>
  
@@ -60,7 +62,11 @@ Index: trunk/src/dates_main.c
  #include "dates_types.h"
  #include "dates_platform.h"
  #include "dates_callbacks.h"
-@@ -566,6 +568,9 @@
+ 
+ #include "gconf-bridge.h"
+@@ -564,10 +566,13 @@ main (int argc, char **argv)
+ 		gtk_widget_show (plug_widget);
+ 	} else {
  		gtk_widget_show (data.main_window);
  	}
  
@@ -70,3 +76,20 @@ Index: trunk/src/dates_main.c
  	gtk_main ();
  
  	/* clean up */
+ 	g_option_context_free (context);
+ 	
+--- dates-0.4.5.orig/src/dates_platform.h
++++ dates-0.4.5/src/dates_platform.h
+@@ -18,11 +18,11 @@
+ #ifndef DATES_UI_GTK_H
+ #define DATES_UI_GTK_H
+ 
+ #include "dates_types.h"
+ 
+-#ifdef WITH_HILDON
++#if 1
+ #define DATES_MENU_WITHOUT_BAR 1
+ #endif
+ 
+ struct DatesData;
+ 
diff --git a/packages/pimlico/tasks-0.13/.mtn2git_empty b/packages/pimlico/tasks-0.13/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pimlico/tasks-0.13/.mtn2git_empty
diff --git a/packages/pimlico/tasks-0.12/tasks-owl.diff b/packages/pimlico/tasks-0.13/tasks-owl.diff
index ce1ed9db7e..ce1ed9db7e 100644
--- a/packages/pimlico/tasks-0.12/tasks-owl.diff
+++ b/packages/pimlico/tasks-0.13/tasks-owl.diff
diff --git a/packages/pimlico/tasks_0.12.bb b/packages/pimlico/tasks_0.13.bb
index ff8da563e6..ff8da563e6 100644
--- a/packages/pimlico/tasks_0.12.bb
+++ b/packages/pimlico/tasks_0.13.bb
diff --git a/packages/pimlico/tasks_svn.bb b/packages/pimlico/tasks_svn.bb
index 5ad983ad97..dc998d2508 100644
--- a/packages/pimlico/tasks_svn.bb
+++ b/packages/pimlico/tasks_svn.bb
@@ -2,9 +2,8 @@ require tasks.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.12+svnr${SRCREV}"
+PV = "0.13+svnr${SRCREV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
-        file://tasks-single.diff;patch=1 \
         file://tasks-owl.diff;patch=1"
diff --git a/packages/pointercal/files/e680/.mtn2git_empty b/packages/pointercal/files/e680/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pointercal/files/e680/.mtn2git_empty
diff --git a/packages/pointercal/files/e680/pointercal b/packages/pointercal/files/e680/pointercal
new file mode 100644
index 0000000000..8b0651dd21
--- /dev/null
+++ b/packages/pointercal/files/e680/pointercal
@@ -0,0 +1 @@
+-19857 -412 18085522 189 -23922 22734294 65536
diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb
index 4fa8c1cc0e..e79ee0b889 100644
--- a/packages/pointercal/pointercal_0.0.bb
+++ b/packages/pointercal/pointercal_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
diff --git a/packages/portmap/portmap_6.0.bb b/packages/portmap/portmap_6.0.bb
index 335b5c6d09..f42ed1e288 100644
--- a/packages/portmap/portmap_6.0.bb
+++ b/packages/portmap/portmap_6.0.bb
@@ -1,8 +1,8 @@
 require portmap.inc
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
+SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
            file://destdir-no-strip.patch;patch=1 \
 	   file://no-tcpd-support.patch;patch=1 \
            file://no-libwrap.patch;patch=1;pnum=0 \
diff --git a/packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h b/packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
deleted file mode 100644
index a03d16e57a..0000000000
--- a/packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
+++ /dev/null
@@ -1,1336 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
-
-#define HAND_IMG_ROWSTRIDE (1016)
-#define HAND_IMG_WIDTH (254)
-#define HAND_IMG_HEIGHT (264)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\331\333\343\342\377\5\327" \
-  "\340\337\377\314\327\325\377\306\323\320\377\321\333\331\377\332\342" \
-  "\341\377\377\333\343\342\377\206\333\343\342\377\1\276\311\307\377\202" \
-  "g~y\377\357\333\343\342\377\2\253\276\272\377\233\262\255\377\204\223" \
-  "\254\247\377\3\225\255\250\377\240\266\262\377\303\321\316\377\377\333" \
-  "\343\342\377\204\333\343\342\377\1\270\305\303\377\202Slg\377\357\333" \
-  "\343\342\377\11\231\260\254\377\223\254\247\377\243\271\264\377\267\307" \
-  "\304\377\277\316\313\377\256\301\275\377\232\261\255\377\223\254\247" \
-  "\377\271\311\306\377\377\333\343\342\377\204\333\343\342\377\1\270\305" \
-  "\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377" \
-  "\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\364\333\343" \
-  "\342\377\4\332\342\341\377\316\330\326\377\277\312\310\377\260\275\273" \
-  "\377\213\254\271\267\377\1\225\246\243\377\202Slg\377\357\333\343\342" \
-  "\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254" \
-  "\247\377\271\311\306\377\362\333\343\342\377\3\266\302\300\377v\212\206" \
-  "\377Vni\377\221Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\360\333" \
-  "\343\342\377\2\320\331\330\377n\204\200\377\224Slg\377\357\333\343\342" \
-  "\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254" \
-  "\247\377\271\311\306\377\357\333\343\342\377\2\332\342\341\377x\215\211" \
-  "\377\225Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377\377" \
-  "\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333\343\342" \
-  "\377\1\240\260\255\377\204Slg\377\4Uni\377s\210\203\377\177\222\217\377" \
-  "\213\235\231\377\213\222\243\240\377\1\202\225\221\377\202Slg\377\357" \
-  "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
-  "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\1{\217\213\377" \
-  "\203Slg\377\2\230\250\245\377\317\330\327\377\216\333\343\342\377\1\270" \
-  "\305\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\1byt\377\202Slg\377\1\230\250\245\377\220\333\343\342\377" \
-  "\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377" \
-  "\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377" \
-  "\356\333\343\342\377\1\324\335\334\377\203Slg\377\1\324\334\333\377\220" \
-  "\333\343\342\377\1\274\307\306\377\202_vr\377\357\333\343\342\377\202" \
-  "\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377" \
-  "\271\311\306\377\356\333\343\342\377\4\332\342\341\377Xql\377Slg\377" \
-  "f|x\377\377\333\343\342\377\204\333\343\342\377\202\231\260\254\377\204" \
-  "\377\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357" \
-  "\333\343\342\377\3n\204\200\377Slg\377_vr\377\377\333\343\342\377\204" \
-  "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
-  "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\1\243\262\257" \
-  "\377\202Slg\377\1\311\324\322\377\220\333\343\342\377\1\325\336\335\377" \
-  "\202\305\320\316\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\4\327\337\336\377dzv\377Slg\377\220\242\236\377\220\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231" \
-  "\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271" \
-  "\311\306\377\360\333\343\342\377\4\307\321\320\377`ws\377Slg\377\240" \
-  "\260\255\377\217\333\343\342\377\1\270\305\303\377\202Slg\377\357\333" \
-  "\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377" \
-  "\223\254\247\377\271\311\306\377\361\333\343\342\377\6\307\322\320\377" \
-  "u\211\205\377Slg\377m\202~\377\246\265\262\377\321\333\331\377\214\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231" \
-  "\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271" \
-  "\311\306\377\362\333\343\342\377\2\332\342\341\377\213\235\231\377\203" \
-  "Slg\377\3Xpk\377f}x\377s\210\203\377\211t\211\205\377\1l\201}\377\202" \
-  "Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3" \
-  "\326\337\335\377\223\254\247\377\271\311\306\377\361\333\343\342\377" \
-  "\2\265\302\300\377i\177{\377\223Slg\377\357\333\343\342\377\202\231\260" \
-  "\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271\311" \
-  "\306\377\360\333\343\342\377\2\255\272\270\377Uni\377\224Slg\377\357" \
-  "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
-  "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\2\316\327\326" \
-  "\377Wpk\377\225Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\1\220\241\236\377\203Slg\377\5Woj\377\205\227\224\377\254" \
-  "\271\267\377\270\304\302\377\304\316\315\377\213\311\324\322\377\1\254" \
-  "\271\267\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\1i\177{\377\202Slg\377\2dzv\377\316\327\326\377\217\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231" \
-  "\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271" \
-  "\311\306\377\356\333\343\342\377\2\331\342\341\377Voj\377\202Slg\377" \
-  "\1\273\307\305\377\220\333\343\342\377\1\270\305\303\377\202Slg\377\357" \
-  "\333\343\342\377\3\241\267\262\377\223\254\247\377\363\366\365\377\203" \
-  "\377\377\377\377\3\304\321\317\377\223\254\247\377\301\317\314\377\356" \
-  "\333\343\342\377\1\324\335\334\377\202Slg\377\2Xpk\377\331\342\341\377" \
-  "\220\333\343\342\377\1\311\324\322\377\202\226\247\244\377\357\333\343" \
-  "\342\377\3\264\305\302\377\223\254\247\377\326\337\335\377\203\377\377" \
-  "\377\377\3\246\273\267\377\223\254\247\377\324\335\334\377\357\333\343" \
-  "\342\377\3_vr\377Slg\377i\177{\377\377\333\343\342\377\202\333\343\342" \
-  "\377\5\317\332\331\377\257\301\276\377\217\251\244\377\223\254\247\377" \
-  "\270\310\305\377\202\377\377\377\377\6\365\367\367\377\223\254\247\377" \
-  "\217\251\244\377\234\263\257\377\275\314\312\377\330\341\340\377\355" \
-  "\333\343\342\377\4\177\222\217\377Slg\377Vni\377\327\337\336\377\376" \
-  "\333\343\342\377\2\277\316\313\377\207\243\236\377\203o\221\212\377\7" \
-  "\221\253\246\377\233\262\256\377\376\376\376\377\377\377\377\377\330" \
-  "\341\337\377\223\254\247\377\202\237\231\377\202o\221\212\377\3t\225" \
-  "\216\377\234\263\257\377\322\334\333\377\353\333\343\342\377\1\277\313" \
-  "\311\377\202Slg\377\1\273\307\305\377\220\333\343\342\377\1\307\322\320" \
-  "\377\202\216\237\234\377\351\333\343\342\377\2\310\325\323\377\216\251" \
-  "\243\377\204o\221\212\377\10v\226\220\377\221\252\245\377\223\254\247" \
-  "\377\324\336\334\377\340\347\346\377\262\304\300\377\223\254\247\377" \
-  "\210\244\237\377\204o\221\212\377\3u\225\217\377\250\274\270\377\327" \
-  "\340\337\377\352\333\343\342\377\4\226\246\243\377Slg\377h\177z\377\321" \
-  "\333\331\377\217\333\343\342\377\1\270\305\303\377\202Slg\377\350\333" \
-  "\343\342\377\2\264\305\302\377q\223\214\377\202o\221\212\377\5q\223\214" \
-  "\377\233\263\256\377\300\317\314\377\331\342\340\377\273\312\307\377" \
-  "\204\223\254\247\377\5\225\255\250\377\330\341\337\377\321\333\332\377" \
-  "\261\303\277\377\206\243\235\377\203o\221\212\377\2\205\242\234\377\317" \
-  "\332\331\377\352\333\343\342\377\4\230\250\245\377Tmh\377q\206\202\377" \
-  "\276\311\307\377\216\333\343\342\377\1\270\305\303\377\202Slg\377\346" \
-  "\333\343\342\377\2\332\342\341\377\241\267\263\377\203o\221\212\377\2" \
-  "\227\257\253\377\315\331\327\377\203\333\343\342\377\1\321\333\332\377" \
-  "\204\262\303\300\377\1\272\312\307\377\204\333\343\342\377\2\270\310" \
-  "\306\377\177\235\227\377\202o\221\212\377\2z\231\222\377\304\322\320" \
-  "\377\347\333\343\342\377\1\317\330\327\377\202\301\314\312\377\10\247" \
-  "\266\263\377^vq\377Slg\377o\204\200\377\232\252\247\377\247\266\263\377" \
-  "\264\301\277\377\277\313\311\377\211\301\314\312\377\1\245\264\261\377" \
-  "\202Slg\377\346\333\343\342\377\1\236\265\260\377\202o\221\212\377\2" \
-  "t\225\216\377\273\313\310\377\220\333\343\342\377\2\327\340\337\377\225" \
-  "\256\251\377\202o\221\212\377\2t\225\216\377\310\325\323\377\346\333" \
-  "\343\342\377\1\233\253\250\377\226Slg\377\345\333\343\342\377\1\261\303" \
-  "\277\377\202o\221\212\377\2|\233\225\377\311\325\323\377\223\333\343" \
-  "\342\377\1\247\273\267\377\202o\221\212\377\2|\233\225\377\322\334\333" \
-  "\377\345\333\343\342\377\1\233\253\250\377\226Slg\377\344\333\343\342" \
-  "\377\5\304\321\317\377q\222\213\377o\221\212\377u\226\217\377\312\326" \
-  "\324\377\225\333\343\342\377\1\242\270\264\377\202o\221\212\377\2\211" \
-  "\244\237\377\332\342\341\377\344\333\343\342\377\1\233\253\250\377\226" \
-  "Slg\377\344\333\343\342\377\4\207\243\236\377o\221\212\377p\222\213\377" \
-  "\275\314\312\377\226\333\343\342\377\2\332\342\341\377\220\252\245\377" \
-  "\202o\221\212\377\1\264\305\302\377\344\333\343\342\377\3\233\253\250" \
-  "\377Slg\377\\so\377\221x\215\211\377\1o\204\200\377\202Slg\377\343\333" \
-  "\343\342\377\1\267\310\305\377\202o\221\212\377\1\237\265\261\377\230" \
-  "\333\343\342\377\5\324\336\334\377v\226\220\377o\221\212\377|\233\225" \
-  "\377\330\341\337\377\343\333\343\342\377\3\233\253\250\377Slg\377t\211" \
-  "\205\377\221\333\343\342\377\1\270\305\303\377\202Slg\377\342\333\343" \
-  "\342\377\5\332\342\341\377~\234\226\377o\221\212\377t\225\216\377\322" \
-  "\334\333\377\231\333\343\342\377\1\251\275\271\377\202o\221\212\377\1" \
-  "\255\300\275\377\343\333\343\342\377\3\233\253\250\377Slg\377t\211\205" \
-  "\377\221\333\343\342\377\1\270\305\303\377\202Slg\377\342\333\343\342" \
-  "\377\1\304\321\317\377\202o\221\212\377\1\245\272\266\377\232\333\343" \
-  "\342\377\4\327\340\337\377y\231\222\377o\221\212\377\207\243\236\377" \
-  "\343\333\343\342\377\3\233\253\250\377Slg\377t\211\205\377\221\333\343" \
-  "\342\377\1\270\305\303\377\202Slg\377\342\333\343\342\377\1\243\270\264" \
-  "\377\202o\221\212\377\1\314\327\325\377\233\333\343\342\377\1\234\263" \
-  "\257\377\202o\221\212\377\1\321\333\332\377\342\333\343\342\377\3\277" \
-  "\312\310\377\237\256\253\377\256\273\271\377\221\333\343\342\377\1\323" \
-  "\334\333\377\202\275\310\306\377\342\333\343\342\377\3\202\237\231\377" \
-  "o\221\212\377\201\236\230\377\234\333\343\342\377\1\276\315\312\377\202" \
-  "o\221\212\377\1\261\303\300\377\377\333\343\342\377\333\333\343\342\377" \
-  "\1\330\341\340\377\202o\221\212\377\1\234\263\256\377\234\333\343\342" \
-  "\377\1\330\341\337\377\202o\221\212\377\1\234\263\257\377\377\333\343" \
-  "\342\377\333\333\343\342\377\1\317\332\330\377\202o\221\212\377\1\250" \
-  "\274\270\377\235\333\343\342\377\3y\230\222\377o\221\212\377\222\254" \
-  "\246\377\377\333\343\342\377\333\333\343\342\377\1\304\322\320\377\202" \
-  "o\221\212\377\1\264\306\302\377\235\333\343\342\377\3\205\242\234\377" \
-  "o\221\212\377\207\243\236\377\350\333\343\342\377\13\327\340\337\377" \
-  "\267\303\301\377\225\246\243\377{\217\213\377p\205\201\377f}x\377k\201" \
-  "}\377u\211\205\377\205\227\224\377\245\263\261\377\310\323\321\377\347" \
-  "\333\343\342\377\1\275\314\312\377\202o\221\212\377\1\274\314\311\377" \
-  "\235\333\343\342\377\3\215\250\242\377o\221\212\377\200\236\230\377\346" \
-  "\333\343\342\377\3\324\334\333\377\231\251\246\377_wr\377\212Slg\377" \
-  "\2x\215\211\377\270\304\302\377\345\333\343\342\377\1\306\323\321\377" \
-  "\202o\221\212\377\1\263\304\301\377\235\333\343\342\377\3\203\240\232" \
-  "\377o\221\212\377\211\244\237\377\345\333\343\342\377\2\300\314\312\377" \
-  "f|x\377\216Slg\377\2\216\240\235\377\330\340\337\377\343\333\343\342" \
-  "\377\1\320\333\331\377\202o\221\212\377\1\247\273\267\377\235\333\343" \
-  "\342\377\3w\227\221\377o\221\212\377\223\254\250\377\344\333\343\342" \
-  "\377\2\273\307\305\377Woj\377\220Slg\377\2y\216\212\377\330\341\340\377" \
-  "\342\333\343\342\377\4\331\342\340\377p\221\213\377o\221\212\377\231" \
-  "\261\254\377\234\333\343\342\377\1\326\337\336\377\202o\221\212\377\1" \
-  "\236\265\260\377\331\333\343\342\377\3\272\306\304\377\231\251\246\377" \
-  "\310\322\321\377\207\333\343\342\377\2\310\322\321\377\\to\377\205Sl" \
-  "g\377\7Woj\377dzv\377q\206\202\377}\221\215\377w\214\210\377k\201|\377" \
-  "]up\377\206Slg\377\1\211\233\230\377\343\333\343\342\377\3\206\242\234" \
-  "\377o\221\212\377|\233\225\377\234\333\343\342\377\1\271\311\306\377" \
-  "\202o\221\212\377\1\265\306\303\377\330\333\343\342\377\1\222\243\240" \
-  "\377\203Slg\377\1\271\306\304\377\206\333\343\342\377\1|\217\214\377" \
-  "\203Slg\377\3dzv\377\231\252\247\377\314\326\324\377\207\333\343\342" \
-  "\377\4\330\340\337\377\267\304\302\377\201\224\220\377Vni\377\203Slg" \
-  "\377\1\274\307\306\377\342\333\343\342\377\1\247\274\270\377\202o\221" \
-  "\212\377\1\307\323\321\377\233\333\343\342\377\4\227\257\253\377o\221" \
-  "\212\377q\222\213\377\324\336\334\377\327\333\343\342\377\2\325\335\334" \
-  "\377Zrm\377\203Slg\377\1\205\227\224\377\205\333\343\342\377\1\275\310" \
-  "\306\377\202Slg\377\3Umh\377\251\270\265\377\331\342\341\377\214\333" \
-  "\343\342\377\2\317\331\327\377y\216\212\377\202Slg\377\1t\211\205\377" \
-  "\342\333\343\342\377\1\310\325\323\377\202o\221\212\377\1\237\265\261" \
-  "\377\232\333\343\342\377\4\325\336\335\377v\226\217\377o\221\212\377" \
-  "\213\246\241\377\330\333\343\342\377\2\331\341\340\377czu\377\203Slg" \
-  "\377\1\221\243\237\377\205\333\343\342\377\4\220\241\236\377Slg\377T" \
-  "lg\377\253\271\267\377\217\333\343\342\377\2\326\336\335\377s\210\204" \
-  "\377\202Slg\377\1\317\331\327\377\342\333\343\342\377\4\203\240\232\377" \
-  "o\221\212\377r\223\214\377\317\331\330\377\205\333\343\342\377\2\305" \
-  "\322\320\377\322\334\332\377\212\333\343\342\377\3\332\342\341\377\305" \
-  "\322\320\377\322\334\333\377\205\333\343\342\377\1\243\270\264\377\202" \
-  "o\221\212\377\1\262\304\301\377\331\333\343\342\377\5\250\266\264\377" \
-  "Yql\377Slg\377f|x\377\310\322\321\377\205\333\343\342\377\3k\201}\377" \
-  "Slg\377\212\234\231\377\221\333\343\342\377\4\321\332\331\377Tmh\377" \
-  "Slg\377\253\271\267\377\342\333\343\342\377\1\276\315\312\377\202o\221" \
-  "\212\377\1\227\257\253\377\204\333\343\342\377\6\327\340\337\377\227" \
-  "\257\252\377\223\254\247\377\251\275\271\377\307\324\322\377\332\342" \
-  "\341\377\205\333\343\342\377\5\325\337\335\377\272\311\307\377\234\263" \
-  "\256\377\223\254\247\377\263\304\301\377\204\333\343\342\377\5\317\332" \
-  "\331\377s\224\215\377o\221\212\377\201\236\230\377\331\342\340\377\332" \
-  "\333\343\342\377\3\324\334\333\377\274\307\306\377\332\342\341\377\206" \
-  "\333\343\342\377\3Xql\377Slg\377\255\272\270\377\222\333\343\342\377" \
-  "\3m\202~\377Slg\377\230\251\246\377\343\333\343\342\377\1\216\250\243" \
-  "\377\202o\221\212\377\1\264\305\302\377\203\333\343\342\377\3\275\314" \
-  "\312\377\223\254\247\377\225\255\250\377\202\223\254\247\377\7\236\264" \
-  "\260\377\273\313\310\377\327\337\336\377\333\343\342\377\315\330\326" \
-  "\377\256\301\275\377\225\255\251\377\202\223\254\247\377\3\224\254\250" \
-  "\377\227\257\252\377\330\341\337\377\202\333\343\342\377\2\330\341\337" \
-  "\377\207\243\236\377\202o\221\212\377\1\273\312\310\377\343\333\343\342" \
-  "\377\1\324\335\334\377\202Slg\377\1\314\326\324\377\222\333\343\342\377" \
-  "\3\214\236\233\377Slg\377\214\235\232\377\343\333\343\342\377\5\312\326" \
-  "\324\377t\225\216\377o\221\212\377q\223\214\377\303\320\316\377\202\333" \
-  "\343\342\377\5\237\265\261\377\223\254\247\377\347\355\354\377\335\344" \
-  "\343\377\257\301\276\377\202\223\254\247\377\2\250\274\270\377\321\334" \
-  "\332\377\202\223\254\247\377\6\231\261\254\377\303\321\316\377\360\363" \
-  "\363\377\271\311\306\377\223\254\247\377\277\315\313\377\202\333\343" \
-  "\342\377\1\227\257\252\377\202o\221\212\377\1\222\254\246\377\344\333" \
-  "\343\342\377\1\325\335\334\377\202Slg\377\1\313\325\323\377\222\333\343" \
-  "\342\377\3\213\235\231\377Slg\377\214\236\233\377\344\333\343\342\377" \
-  "\1\273\312\310\377\202o\221\212\377\5v\226\220\377\277\316\313\377\311" \
-  "\325\323\377\223\254\247\377\251\275\271\377\203\377\377\377\377\7\355" \
-  "\361\360\377\227\257\253\377\226\256\251\377\273\312\307\377\223\254" \
-  "\247\377\271\311\306\377\372\373\373\377\202\377\377\377\377\5\346\354" \
-  "\353\377\223\254\247\377\240\266\262\377\330\341\340\377\232\261\255" \
-  "\377\202o\221\212\377\2\203\240\232\377\326\337\336\377\334\333\343\342" \
-  "\377\3\322\333\332\377\267\303\301\377\331\341\340\377\206\333\343\342" \
-  "\377\3Yql\377Slg\377\253\271\267\377\222\333\343\342\377\3k\201}\377" \
-  "Slg\377\231\251\246\377\345\333\343\342\377\1\252\276\272\377\202o\221" \
-  "\212\377\4p\222\213\377\234\263\256\377\223\254\247\377\327\340\336\377" \
-  "\203\377\377\377\377\2\344\352\351\377\232\261\254\377\202\223\254\247" \
-  "\377\3\224\255\250\377\262\303\300\377\371\372\372\377\203\377\377\377" \
-  "\377\3\250\274\270\377\223\254\247\377\214\246\241\377\202o\221\212\377" \
-  "\2y\231\222\377\317\331\330\377\334\333\343\342\377\5\247\266\263\377" \
-  "Xql\377Slg\377`ws\377\305\320\316\377\205\333\343\342\377\3l\201}\377" \
-  "Slg\377\210\233\227\377\221\333\343\342\377\4\317\331\327\377Tlg\377" \
-  "Slg\377\254\271\267\377\346\333\343\342\377\6\257\301\276\377p\222\213" \
-  "\377r\223\214\377\222\253\246\377\233\262\256\377\374\374\374\377\202" \
-  "\377\377\377\377\11\316\331\327\377\223\254\247\377\252\275\272\377\320" \
-  "\333\331\377\332\343\341\377\305\323\320\377\227\257\253\377\237\265" \
-  "\261\377\362\365\364\377\202\377\377\377\377\6\325\337\335\377\223\254" \
-  "\247\377\206\242\234\377o\221\212\377\202\237\231\377\315\330\326\377" \
-  "\334\333\343\342\377\2\331\341\340\377czu\377\203Slg\377\1\217\241\235" \
-  "\377\205\333\343\342\377\1\221\243\237\377\202Slg\377\1\251\267\265\377" \
-  "\217\333\343\342\377\5\325\335\334\377p\206\202\377Slg\377Tlg\377\320" \
-  "\331\330\377\347\333\343\342\377\4\277\316\313\377\204\241\233\377\223" \
-  "\254\247\377\306\323\320\377\202\377\377\377\377\4\352\357\356\377\225" \
-  "\255\250\377\300\317\314\377\376\376\376\377\203\377\377\377\377\12\361" \
-  "\364\363\377\236\264\260\377\257\302\276\377\376\376\376\377\377\377" \
-  "\377\377\373\374\373\377\232\261\254\377\222\253\246\377\217\251\244" \
-  "\377\325\337\335\377\335\333\343\342\377\2\325\336\335\377[sn\377\203" \
-  "Slg\377\1\206\231\225\377\205\333\343\342\377\1\276\312\310\377\202S" \
-  "lg\377\3Umh\377\251\267\265\377\331\342\341\377\214\333\343\342\377\2" \
-  "\315\326\325\377v\213\207\377\202Slg\377\1v\213\207\377\350\333\343\342" \
-  "\377\4\331\341\340\377\230\260\253\377\224\254\247\377\362\365\364\377" \
-  "\202\377\377\377\377\3\272\312\307\377\243\270\264\377\374\375\375\377" \
-  "\205\377\377\377\377\3\335\345\343\377\223\254\247\377\352\357\356\377" \
-  "\202\377\377\377\377\3\304\321\317\377\223\254\247\377\267\307\304\377" \
-  "\337\333\343\342\377\1\223\244\240\377\202Slg\377\2Umh\377\275\310\306" \
-  "\377\206\333\343\342\377\1~\222\216\377\203Slg\377\4czu\377\227\247\244" \
-  "\377\310\322\321\377\331\341\340\377\206\333\343\342\377\4\325\335\334" \
-  "\377\263\300\276\377}\220\215\377Tmh\377\203Slg\377\1\277\312\310\377" \
-  "\350\333\343\342\377\3\302\320\315\377\223\254\247\377\264\305\302\377" \
-  "\203\377\377\377\377\2\243\271\264\377\277\316\313\377\206\377\377\377" \
-  "\377\3\373\374\373\377\224\255\250\377\322\335\333\377\202\377\377\377" \
-  "\377\4\360\363\363\377\223\254\247\377\232\262\255\377\332\342\341\377" \
-  "\337\333\343\342\377\3\274\310\306\377\236\255\253\377\315\327\325\377" \
-  "\207\333\343\342\377\2\311\324\322\377^uq\377\205Slg\377\7Tmh\377_wr" \
-  "\377m\202~\377y\215\211\377s\210\204\377f}x\377Yql\377\206Slg\377\1\217" \
-  "\240\235\377\351\333\343\342\377\3\244\271\265\377\223\254\247\377\342" \
-  "\350\347\377\203\377\377\377\377\2\240\266\262\377\302\320\315\377\206" \
-  "\377\377\377\377\3\374\375\375\377\225\255\251\377\317\332\330\377\203" \
-  "\377\377\377\377\3\262\304\300\377\223\254\247\377\303\321\317\377\352" \
-  "\333\343\342\377\2\275\311\307\377Xql\377\220Slg\377\2}\221\215\377\331" \
-  "\342\341\377\350\333\343\342\377\4\316\331\327\377\223\254\247\377\243" \
-  "\270\264\377\376\376\376\377\203\377\377\377\377\2\267\307\304\377\250" \
-  "\274\270\377\206\377\377\377\377\3\345\353\351\377\223\254\247\377\346" \
-  "\354\353\377\203\377\377\377\377\3\340\347\345\377\223\254\247\377\245" \
-  "\272\266\377\353\333\343\342\377\2\303\316\314\377h\177z\377\215Slg\377" \
-  "\3Tlg\377\225\245\242\377\331\341\340\377\351\333\343\342\377\3\257\302" \
-  "\276\377\223\254\247\377\320\333\331\377\204\377\377\377\377\3\340\347" \
-  "\346\377\223\254\247\377\317\332\330\377\204\377\377\377\377\4\371\372" \
-  "\372\377\245\272\266\377\246\272\266\377\374\375\375\377\203\377\377" \
-  "\377\377\4\376\376\376\377\242\267\263\377\223\254\247\377\317\331\330" \
-  "\377\353\333\343\342\377\3\325\335\334\377\235\255\252\377czu\377\211" \
-  "Slg\377\3Tlg\377\177\222\217\377\277\312\310\377\352\333\343\342\377" \
-  "\4\326\337\336\377\225\256\251\377\227\257\253\377\371\372\372\377\205" \
-  "\377\377\377\377\11\277\316\313\377\223\254\247\377\272\312\307\377\341" \
-  "\350\346\377\353\360\357\377\326\340\336\377\240\266\261\377\227\257" \
-  "\252\377\352\357\356\377\205\377\377\377\377\3\316\331\327\377\223\254" \
-  "\247\377\260\302\277\377\355\333\343\342\377\13\330\341\340\377\273\307" \
-  "\305\377\231\252\247\377\177\222\217\377t\211\205\377k\201|\377o\205" \
-  "\201\377y\215\211\377\211\233\230\377\251\267\265\377\314\326\324\377" \
-  "\354\333\343\342\377\3\273\312\310\377\223\254\247\377\277\316\313\377" \
-  "\207\377\377\377\377\2\315\330\327\377\224\255\250\377\203\223\254\247" \
-  "\377\2\235\263\257\377\360\363\362\377\206\377\377\377\377\4\370\371" \
-  "\371\377\227\257\252\377\226\256\252\377\327\340\336\377\377\333\343" \
-  "\342\377\343\333\343\342\377\4\332\342\341\377\235\263\257\377\223\254" \
-  "\247\377\354\361\360\377\207\377\377\377\377\7\310\325\322\377\223\254" \
-  "\247\377\262\303\300\377\307\323\321\377\231\260\253\377\225\255\251" \
-  "\377\365\367\367\377\207\377\377\377\377\3\275\314\311\377\223\254\247" \
-  "\377\274\313\311\377\346\333\343\342\377\1\316\327\326\377\205\301\314" \
-  "\312\377\1\327\340\337\377\365\333\343\342\377\3\306\323\321\377\223" \
-  "\254\247\377\256\300\275\377\207\377\377\377\377\10\374\375\375\377\235" \
-  "\264\257\377\224\255\250\377\324\336\334\377\333\343\342\377\266\307" \
-  "\304\377\223\254\247\377\312\326\324\377\207\377\377\377\377\3\353\357" \
-  "\356\377\223\254\247\377\236\264\260\377\346\333\343\342\377\1\204\227" \
-  "\223\377\205Slg\377\1\311\324\322\377\365\333\343\342\377\3\250\274\270" \
-  "\377\223\254\247\377\335\345\344\377\207\377\377\377\377\3\332\342\340" \
-  "\377\223\254\247\377\254\277\274\377\202\333\343\342\377\4\323\335\334" \
-  "\377\224\255\250\377\236\265\260\377\375\376\375\377\207\377\377\377" \
-  "\377\3\256\301\275\377\223\254\247\377\310\324\322\377\345\333\343\342" \
-  "\377\1i\177{\377\205Slg\377\1\311\324\322\377\364\333\343\342\377\4\321" \
-  "\334\332\377\223\254\247\377\240\265\261\377\376\376\376\377\207\377" \
-  "\377\377\377\3\254\277\274\377\223\254\247\377\312\326\324\377\203\333" \
-  "\343\342\377\3\253\276\272\377\223\254\247\377\334\344\342\377\207\377" \
-  "\377\377\377\3\333\343\342\377\223\254\247\377\251\275\271\377\345\333" \
-  "\343\342\377\1Vni\377\202Slg\377\4Yrm\377\234\253\251\377\302\315\313" \
-  "\377\331\342\341\377\364\333\343\342\377\3\264\305\302\377\223\254\247" \
-  "\377\314\330\325\377\207\377\377\377\377\3\353\360\357\377\223\254\247" \
-  "\377\241\266\262\377\204\333\343\342\377\3\311\325\323\377\223\254\247" \
-  "\377\256\301\275\377\207\377\377\377\377\4\375\375\375\377\236\265\260" \
-  "\377\223\254\247\377\322\334\333\377\343\333\343\342\377\1\324\334\333" \
-  "\377\203Slg\377\1\261\277\274\377\366\333\343\342\377\4\330\341\340\377" \
-  "\230\260\253\377\225\256\251\377\366\370\370\377\207\377\377\377\377" \
-  "\3\276\315\312\377\223\254\247\377\277\315\313\377\205\333\343\342\377" \
-  "\3\237\265\261\377\223\254\247\377\355\361\360\377\207\377\377\377\377" \
-  "\3\312\326\324\377\223\254\247\377\265\306\303\377\343\333\343\342\377" \
-  "\1\326\337\336\377\202Slg\377\1]up\377\367\333\343\342\377\3\277\316" \
-  "\313\377\223\254\247\377\272\312\307\377\207\377\377\377\377\4\370\371" \
-  "\371\377\227\257\252\377\230\257\253\377\330\341\337\377\205\333\343" \
-  "\342\377\3\275\314\312\377\223\254\247\377\277\316\313\377\207\377\377" \
-  "\377\377\4\365\367\367\377\225\255\251\377\231\260\254\377\331\341\340" \
-  "\377\343\333\343\342\377\3`ws\377Slg\377i\200{\377\367\333\343\342\377" \
-  "\3\241\267\263\377\223\254\247\377\350\355\354\377\207\377\377\377\377" \
-  "\3\317\332\330\377\223\254\247\377\263\305\301\377\206\333\343\342\377" \
-  "\4\327\340\337\377\227\257\252\377\230\260\253\377\371\372\372\377\207" \
-  "\377\377\377\377\3\271\311\306\377\223\254\247\377\301\317\314\377\343" \
-  "\333\343\342\377\4y\215\211\377Slg\377Vni\377\327\340\337\377\220\333" \
-  "\343\342\377\1\324\335\334\377\202\301\314\312\377\342\333\343\342\377" \
-  "\3\313\327\325\377\223\254\247\377\251\275\271\377\207\377\377\377\377" \
-  "\4\376\376\376\377\242\267\263\377\223\254\247\377\321\333\332\377\207" \
-  "\333\343\342\377\3\262\303\300\377\223\254\247\377\321\334\332\377\207" \
-  "\377\377\377\377\3\346\354\352\377\223\254\247\377\242\270\263\377\343" \
-  "\333\343\342\377\1\260\276\273\377\202Slg\377\1\300\313\311\377\220\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\342\333\343\342\377\3\255\300" \
-  "\274\377\223\254\247\377\327\340\336\377\207\377\377\377\377\3\340\347" \
-  "\346\377\223\254\247\377\247\273\270\377\210\333\343\342\377\3\320\332" \
-  "\331\377\223\254\247\377\244\271\265\377\210\377\377\377\377\3\247\273" \
-  "\267\377\223\254\247\377\314\330\326\377\342\333\343\342\377\5\331\342" \
-  "\341\377o\205\201\377Slg\377x\215\211\377\331\342\341\377\217\333\343" \
-  "\342\377\1\270\305\303\377\202Slg\377\341\333\343\342\377\4\325\336\335" \
-  "\377\225\255\250\377\233\262\255\377\374\374\374\377\207\377\377\377" \
-  "\377\3\263\305\301\377\223\254\247\377\306\323\321\377\211\333\343\342" \
-  "\377\3\246\273\267\377\223\254\247\377\343\351\350\377\207\377\377\377" \
-  "\377\3\325\336\334\377\223\254\247\377\256\300\275\377\343\333\343\342" \
-  "\377\5\316\330\326\377dzv\377Slg\377\220\241\236\377\332\342\341\377" \
-  "\216\333\343\342\377\1\270\305\303\377\202Slg\377\341\333\343\342\377" \
-  "\3\270\310\306\377\223\254\247\377\305\323\320\377\207\377\377\377\377" \
-  "\4\361\364\363\377\223\254\247\377\234\263\257\377\332\342\341\377\211" \
-  "\333\343\342\377\3\304\322\317\377\223\254\247\377\265\306\302\377\207" \
-  "\377\377\377\377\4\373\374\373\377\232\261\254\377\225\255\251\377\325" \
-  "\337\335\377\343\333\343\342\377\6\316\327\326\377\200\224\220\377Sl" \
-  "g\377h~z\377\246\265\262\377\326\336\335\377\214\333\343\342\377\1\270" \
-  "\305\303\377\202Slg\377\340\333\343\342\377\4\332\342\341\377\233\262" \
-  "\255\377\223\254\247\377\361\364\364\377\207\377\377\377\377\3\304\322" \
-  "\317\377\223\254\247\377\272\312\307\377\212\333\343\342\377\4\332\342" \
-  "\341\377\233\262\256\377\224\254\247\377\362\365\364\377\207\377\377" \
-  "\377\377\3\303\321\316\377\223\254\247\377\272\311\307\377\341\333\343" \
-  "\342\377\1\257\274\272\377\203}\220\215\377\1^vq\377\203Slg\377\3^vq" \
-  "\377n\203\177\377{\217\213\377\211}\220\215\377\1r\207\203\377\202Sl" \
-  "g\377\340\333\343\342\377\3\304\321\317\377\223\254\247\377\264\305\301" \
-  "\377\207\377\377\377\377\4\373\374\374\377\232\262\255\377\225\256\251" \
-  "\377\326\337\336\377\213\333\343\342\377\3\271\311\306\377\223\254\247" \
-  "\377\307\324\321\377\207\377\377\377\377\4\360\363\362\377\223\254\247" \
-  "\377\234\263\256\377\332\342\341\377\340\333\343\342\377\1\233\253\250" \
-  "\377\226Slg\377\340\333\343\342\377\3\246\272\266\377\223\254\247\377" \
-  "\341\350\347\377\207\377\377\377\377\3\326\337\335\377\223\254\247\377" \
-  "\256\301\275\377\214\333\343\342\377\4\325\336\335\377\225\255\250\377" \
-  "\234\263\256\377\374\375\374\377\207\377\377\377\377\3\262\304\300\377" \
-  "\223\254\247\377\305\322\320\377\340\333\343\342\377\1\233\253\250\377" \
-  "\226Slg\377\337\333\343\342\377\4\317\332\330\377\223\254\247\377\242" \
-  "\270\263\377\376\376\376\377\207\377\377\377\377\3\251\274\270\377\223" \
-  "\254\247\377\315\330\326\377\215\333\343\342\377\3\255\300\274\377\223" \
-  "\254\247\377\330\341\337\377\207\377\377\377\377\3\337\346\345\377\223" \
-  "\254\247\377\247\273\267\377\340\333\343\342\377\1\233\253\250\377\226" \
-  "Slg\377\337\333\343\342\377\3\261\303\300\377\223\254\247\377\320\333" \
-  "\331\377\207\377\377\377\377\3\347\355\354\377\223\254\247\377\243\270" \
-  "\264\377\216\333\343\342\377\3\314\327\325\377\223\254\247\377\252\276" \
-  "\272\377\207\377\377\377\377\4\376\376\376\377\241\267\262\377\223\254" \
-  "\247\377\320\333\331\377\337\333\343\342\377\3\233\253\250\377Slg\377" \
-  "m\202~\377\221\275\310\306\377\1\242\261\256\377\202Slg\377\336\333\343" \
-  "\342\377\1\327\340\337\377\202\227\257\252\377\1\370\372\371\377\207" \
-  "\377\377\377\377\3\272\312\307\377\223\254\247\377\301\317\315\377\217" \
-  "\333\343\342\377\3\241\267\263\377\223\254\247\377\351\356\355\377\207" \
-  "\377\377\377\377\3\316\331\327\377\223\254\247\377\263\304\301\377\337" \
-  "\333\343\342\377\3\233\253\250\377Slg\377t\211\205\377\221\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\336\333\343\342\377\3\275\314\311\377" \
-  "\223\254\247\377\277\315\312\377\207\377\377\377\377\4\366\370\367\377" \
-  "\225\256\251\377\231\260\254\377\331\341\340\377\217\333\343\342\377" \
-  "\3\300\316\314\377\223\254\247\377\274\313\310\377\207\377\377\377\377" \
-  "\4\367\371\371\377\226\256\252\377\227\257\252\377\330\340\337\377\336" \
-  "\333\343\342\377\3\233\253\250\377Slg\377t\211\205\377\221\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\336\333\343\342\377\3\237\265\260\377" \
-  "\223\254\247\377\354\360\357\377\207\377\377\377\377\3\313\327\325\377" \
-  "\223\254\247\377\266\306\303\377\220\333\343\342\377\4\331\341\340\377" \
-  "\230\260\253\377\226\256\252\377\367\371\370\377\207\377\377\377\377" \
-  "\3\274\314\311\377\223\254\247\377\276\315\312\377\336\333\343\342\377" \
-  "\3\237\256\253\377[sn\377{\217\213\377\221\333\343\342\377\1\302\315" \
-  "\313\377\202x\215\211\377\335\333\343\342\377\3\310\325\323\377\223\254" \
-  "\247\377\255\300\274\377\207\377\377\377\377\4\375\376\375\377\237\265" \
-  "\261\377\224\254\247\377\323\334\333\377\221\333\343\342\377\3\264\305" \
-  "\302\377\223\254\247\377\315\331\326\377\207\377\377\377\377\3\352\357" \
-  "\356\377\223\254\247\377\240\266\261\377\377\333\343\342\377\323\333" \
-  "\343\342\377\3\252\276\272\377\223\254\247\377\333\343\341\377\207\377" \
-  "\377\377\377\3\335\344\343\377\223\254\247\377\252\275\272\377\222\333" \
-  "\343\342\377\4\322\334\332\377\223\254\247\377\241\266\262\377\376\376" \
-  "\376\377\207\377\377\377\377\3\253\276\273\377\223\254\247\377\312\326" \
-  "\324\377\356\333\343\342\377\1\331\342\341\377\341\333\343\342\377\4" \
-  "\323\335\333\377\224\254\247\377\235\264\257\377\375\375\375\377\207" \
-  "\377\377\377\377\3\257\302\276\377\223\254\247\377\310\324\322\377\207" \
-  "\333\343\342\377\4\327\340\337\377\264\305\302\377\260\302\277\377\305" \
-  "\321\317\377\210\333\343\342\377\3\251\274\271\377\223\254\247\377\337" \
-  "\346\345\377\207\377\377\377\377\3\330\341\337\377\223\254\247\377\253" \
-  "\276\273\377\356\333\343\342\377\5\264\301\277\377^uq\377w\214\210\377" \
-  "\236\255\253\377\330\341\340\377\335\333\343\342\377\3\266\306\303\377" \
-  "\223\254\247\377\311\325\323\377\207\377\377\377\377\3\356\362\361\377" \
-  "\223\254\247\377\236\265\260\377\210\333\343\342\377\5\251\275\272\377" \
-  "\226\256\251\377\240\266\261\377\222\253\246\377\316\331\330\377\207" \
-  "\333\343\342\377\3\307\323\321\377\223\254\247\377\261\303\300\377\207" \
-  "\377\377\377\377\4\374\375\374\377\234\263\256\377\224\255\250\377\324" \
-  "\335\334\377\334\333\343\342\377\3\241\260\255\377_vr\377z\216\212\377" \
-  "\216\333\343\342\377\1\264\301\277\377\203Slg\377\2m\202~\377\312\324" \
-  "\323\377\333\333\343\342\377\4\331\341\340\377\231\261\254\377\225\255" \
-  "\250\377\364\367\366\377\207\377\377\377\377\3\301\317\314\377\223\254" \
-  "\247\377\275\314\311\377\207\333\343\342\377\6\331\342\341\377\225\255" \
-  "\250\377\320\333\331\377\374\375\375\377\234\263\256\377\261\303\300" \
-  "\377\207\333\343\342\377\4\332\342\341\377\235\264\257\377\223\254\247" \
-  "\377\360\363\362\377\207\377\377\377\377\3\307\324\321\377\223\254\247" \
-  "\377\267\310\305\377\334\333\343\342\377\3\233\253\250\377Slg\377p\205" \
-  "\201\377\216\333\343\342\377\2\270\305\303\377Woj\377\203Slg\377\1~\221" \
-  "\216\377\333\333\343\342\377\3\301\317\315\377\223\254\247\377\270\310" \
-  "\305\377\207\377\377\377\377\4\371\373\372\377\230\260\253\377\226\256" \
-  "\252\377\327\340\336\377\207\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\210\333\343\342\377\3\273\313\310\377\223\254\247\377\303\321\316" \
-  "\377\207\377\377\377\377\4\363\365\365\377\224\255\250\377\232\261\255" \
-  "\377\331\342\341\377\333\333\343\342\377\3\233\253\250\377Slg\377p\205" \
-  "\201\377\217\333\343\342\377\3\332\342\341\377\306\321\317\377\206\230" \
-  "\225\377\202Slg\377\1\300\313\311\377\332\333\343\342\377\3\243\270\264" \
-  "\377\223\254\247\377\345\353\352\377\207\377\377\377\377\3\322\335\333" \
-  "\377\223\254\247\377\261\303\277\377\210\333\343\342\377\6\331\340\337" \
-  "\377\223\254\247\377\332\342\341\377\377\377\377\377\251\275\271\377" \
-  "\255\300\275\377\210\333\343\342\377\4\326\337\336\377\226\256\251\377" \
-  "\232\261\254\377\372\373\373\377\207\377\377\377\377\3\266\307\303\377" \
-  "\223\254\247\377\303\320\316\377\333\333\343\342\377\3\233\253\250\377" \
-  "Slg\377p\205\201\377\221\333\343\342\377\4\332\342\341\377q\207\202\377" \
-  "Slg\377\246\264\262\377\331\333\343\342\377\3\315\330\326\377\223\254" \
-  "\247\377\246\273\267\377\210\377\377\377\377\3\245\272\266\377\223\254" \
-  "\247\377\317\332\330\377\210\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\211\333\343\342\377\3\260\302\276\377\223\254\247\377\324\336\334" \
-  "\377\207\377\377\377\377\3\343\351\350\377\223\254\247\377\244\271\265" \
-  "\377\333\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\222\333" \
-  "\343\342\377\3\223\244\240\377Slg\377\223\244\240\377\331\333\343\342" \
-  "\377\3\257\301\276\377\223\254\247\377\324\336\334\377\207\377\377\377" \
-  "\377\3\344\352\351\377\223\254\247\377\245\272\266\377\211\333\343\342" \
-  "\377\6\331\340\337\377\223\254\247\377\332\342\341\377\377\377\377\377" \
-  "\251\275\271\377\255\300\275\377\211\333\343\342\377\3\316\331\327\377" \
-  "\223\254\247\377\247\273\267\377\210\377\377\377\377\3\244\271\265\377" \
-  "\223\254\247\377\316\331\327\377\332\333\343\342\377\3\233\253\250\377" \
-  "Slg\377p\205\201\377\222\333\343\342\377\3\213\235\232\377Slg\377\214" \
-  "\235\232\377\330\333\343\342\377\10\326\337\336\377\225\256\251\377\231" \
-  "\261\254\377\372\373\373\377\354\360\357\377\301\317\315\377\325\337" \
-  "\335\377\373\374\374\377\203\377\377\377\377\3\266\307\303\377\223\254" \
-  "\247\377\303\321\317\377\211\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\212\333\343\342\377\3\244\271\265\377\223\254\247\377\346\353\352" \
-  "\377\203\377\377\377\377\7\356\362\362\377\303\321\316\377\322\334\332" \
-  "\377\372\373\373\377\322\334\332\377\223\254\247\377\260\302\277\377" \
-  "\332\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\221\333\343" \
-  "\342\377\4\314\325\324\377_wr\377Slg\377\235\254\252\377\306\333\343" \
-  "\342\377\1\203\240\232\377\205r\223\214\377\1w\227\221\377\213\253\276" \
-  "\273\377\16\240\265\262\377\223\254\247\377\302\320\315\377\266\307\304" \
-  "\377\223\254\247\377\233\262\256\377\223\254\247\377\233\262\255\377" \
-  "\346\353\352\377\377\377\377\377\363\366\365\377\224\255\250\377\225" \
-  "\256\251\377\252\275\272\377\211\253\276\273\377\6\252\275\272\377\223" \
-  "\254\247\377\332\342\341\377\377\377\377\377\250\274\270\377\233\262" \
-  "\256\377\212\253\276\273\377\3\242\267\264\377\223\254\247\377\270\310" \
-  "\305\377\202\377\377\377\377\11\275\315\312\377\223\254\247\377\232\262" \
-  "\255\377\224\255\250\377\231\261\254\377\332\344\341\377\230\260\253" \
-  "\377\224\254\250\377\251\275\271\377\212\253\276\273\377\1\227\257\253" \
-  "\377\205r\223\214\377\2s\224\215\377\261\303\300\377\300\333\343\342" \
-  "\377\1\267\304\302\377\206\211\234\230\377\3p\205\201\377Slg\377^vq\377" \
-  "\216\211\234\230\377\4\206\231\225\377\177\223\217\377r\207\203\377T" \
-  "mh\377\202Slg\377\1\257\274\272\377\306\333\343\342\377\1|\233\224\377" \
-  "\221o\221\212\377\15\215\250\242\377\223\254\247\377\335\345\343\377" \
-  "\223\254\247\377\317\332\330\377\375\375\375\377\360\363\363\377\243" \
-  "\270\264\377\265\306\303\377\377\377\377\377\310\325\322\377\223\254" \
-  "\247\377\200\236\227\377\212o\221\212\377\6p\221\212\377\223\254\247" \
-  "\377\332\342\341\377\377\377\377\377\247\273\267\377\205\242\234\377" \
-  "\213o\221\212\377\15\217\251\244\377\224\255\250\377\365\367\367\377" \
-  "\361\364\364\377\224\255\250\377\306\323\321\377\374\375\375\377\363" \
-  "\366\365\377\252\276\272\377\255\300\274\377\300\317\314\377\223\254" \
-  "\247\377~\234\226\377\221o\221\212\377\1\256\301\276\377\300\333\343" \
-  "\342\377\1\237\256\253\377\234Slg\377\2]up\377\321\333\331\377\306\333" \
-  "\343\342\377\1|\233\224\377\220o\221\212\377\6y\230\222\377\223\254\247" \
-  "\377\261\303\277\377\277\316\313\377\235\264\257\377\376\376\376\377" \
-  "\202\377\377\377\377\6\317\332\330\377\224\255\250\377\362\366\365\377" \
-  "\234\263\257\377\222\253\246\377r\223\214\377\212o\221\212\377\6p\221" \
-  "\212\377\223\254\247\377\332\342\341\377\377\377\377\377\247\273\267" \
-  "\377\205\242\234\377\213o\221\212\377\6\201\236\230\377\223\254\247\377" \
-  "\312\326\323\377\310\324\322\377\227\257\252\377\372\373\373\377\202" \
-  "\377\377\377\377\5\331\342\340\377\223\254\247\377\337\346\345\377\223" \
-  "\254\247\377\215\247\242\377\221o\221\212\377\1\256\301\276\377\300\333" \
-  "\343\342\377\1\237\256\253\377\234Slg\377\1\246\265\262\377\307\333\343" \
-  "\342\377\1|\233\224\377\220o\221\212\377\6\210\244\236\377\223\254\247" \
-  "\377\336\346\344\377\320\333\330\377\225\256\251\377\365\367\367\377" \
-  "\202\377\377\377\377\5\275\315\312\377\236\264\260\377\327\341\337\377" \
-  "\223\254\247\377\206\242\234\377\213o\221\212\377\6p\221\212\377\223" \
-  "\254\247\377\332\342\341\377\377\377\377\377\247\273\267\377\205\242" \
-  "\234\377\213o\221\212\377\6r\223\214\377\222\253\246\377\236\264\260" \
-  "\377\327\340\336\377\223\254\247\377\354\360\357\377\202\377\377\377" \
-  "\377\6\310\324\322\377\231\260\253\377\371\373\373\377\257\301\276\377" \
-  "\223\254\247\377x\230\221\377\220o\221\212\377\1\256\301\276\377\300" \
-  "\333\343\342\377\1\237\256\253\377\232Slg\377\2q\207\202\377\267\304" \
-  "\302\377\310\333\343\342\377\1|\233\224\377\217o\221\212\377\16s\224" \
-  "\215\377\222\253\246\377\240\266\262\377\376\376\376\377\371\372\372" \
-  "\377\230\260\253\377\250\274\270\377\326\337\336\377\301\317\315\377" \
-  "\226\256\251\377\310\325\322\377\253\277\273\377\223\254\247\377w\227" \
-  "\220\377\213o\221\212\377\6p\221\212\377\223\254\247\377\332\342\341" \
-  "\377\377\377\377\377\247\273\267\377\205\242\234\377\214o\221\212\377" \
-  "\15\206\242\235\377\223\254\247\377\330\341\340\377\234\263\256\377\245" \
-  "\272\265\377\324\336\334\377\305\322\317\377\230\260\253\377\301\317" \
-  "\314\377\377\377\377\377\334\344\343\377\223\254\247\377\207\243\236" \
-  "\377\220o\221\212\377\1\256\301\276\377\300\333\343\342\377\1\306\321" \
-  "\317\377\206\254\271\267\377\3\202\225\221\377Slg\377f|x\377\216\254" \
-  "\271\267\377\3\263\300\276\377\304\317\315\377\325\335\334\377\312\333" \
-  "\343\342\377\1\255\300\274\377\205\244\271\265\377\1\251\275\271\377" \
-  "\211\333\343\342\377\3\263\305\301\377\223\254\247\377\315\330\326\377" \
-  "\202\377\377\377\377\10\341\350\346\377\257\301\275\377\223\254\247\377" \
-  "\234\263\256\377\306\323\321\377\345\352\351\377\223\254\247\377\241" \
-  "\266\262\377\214\333\343\342\377\6\331\340\337\377\223\254\247\377\332" \
-  "\342\341\377\377\377\377\377\251\275\271\377\255\300\275\377\214\333" \
-  "\343\342\377\16\311\325\323\377\223\254\247\377\256\300\275\377\344\352" \
-  "\351\377\262\304\301\377\223\254\247\377\231\261\254\377\303\321\316" \
-  "\377\365\367\367\377\377\377\377\377\375\376\375\377\237\265\260\377" \
-  "\223\254\247\377\322\334\333\377\210\333\343\342\377\1\310\324\322\377" \
-  "\206\244\271\265\377\1\304\322\320\377\307\333\343\342\377\3\233\253" \
-  "\250\377Slg\377p\205\201\377\352\333\343\342\377\4\330\341\337\377\230" \
-  "\257\253\377\226\256\251\377\366\370\370\377\204\377\377\377\377\6\361" \
-  "\364\363\377\374\375\375\377\377\377\377\377\275\314\311\377\223\254" \
-  "\247\377\277\315\313\377\214\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\215\333\343\342\377\6\237\265\261\377\223\254\247\377\354\361\360" \
-  "\377\377\377\377\377\362\365\365\377\372\373\373\377\204\377\377\377" \
-  "\377\3\313\327\324\377\223\254\247\377\265\306\302\377\327\333\343\342" \
-  "\377\3\233\253\250\377Slg\377p\205\201\377\352\333\343\342\377\3\277" \
-  "\315\313\377\223\254\247\377\274\313\310\377\207\377\377\377\377\4\370" \
-  "\371\371\377\227\257\252\377\230\257\253\377\330\341\337\377\214\333" \
-  "\343\342\377\6\331\340\337\377\223\254\247\377\332\342\341\377\377\377" \
-  "\377\377\251\275\271\377\255\300\275\377\215\333\343\342\377\3\275\314" \
-  "\312\377\223\254\247\377\277\316\313\377\207\377\377\377\377\4\366\370" \
-  "\367\377\225\256\251\377\230\260\253\377\331\341\340\377\326\333\343" \
-  "\342\377\3\253\271\266\377t\211\205\377\213\235\231\377\352\333\343\342" \
-  "\377\3\241\266\262\377\223\254\247\377\351\356\355\377\207\377\377\377" \
-  "\377\3\317\332\330\377\223\254\247\377\263\305\301\377\215\333\343\342" \
-  "\377\6\331\340\337\377\223\254\247\377\332\342\341\377\377\377\377\377" \
-  "\251\275\271\377\255\300\275\377\215\333\343\342\377\4\327\340\337\377" \
-  "\227\257\252\377\227\257\253\377\371\372\372\377\207\377\377\377\377" \
-  "\3\271\311\306\377\223\254\247\377\300\316\314\377\377\333\343\342\377" \
-  "\303\333\343\342\377\3\312\326\324\377\223\254\247\377\252\275\271\377" \
-  "\207\377\377\377\377\4\376\376\376\377\242\267\263\377\223\254\247\377" \
-  "\321\333\332\377\215\333\343\342\377\6\331\340\337\377\223\254\247\377" \
-  "\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275\377\216" \
-  "\333\343\342\377\3\262\303\300\377\223\254\247\377\320\333\331\377\207" \
-  "\377\377\377\377\3\347\354\353\377\223\254\247\377\242\267\263\377\377" \
-  "\333\343\342\377\303\333\343\342\377\3\254\277\274\377\223\254\247\377" \
-  "\330\341\337\377\207\377\377\377\377\3\340\347\346\377\223\254\247\377" \
-  "\247\273\270\377\216\333\343\342\377\6\331\340\337\377\223\254\247\377" \
-  "\330\341\337\377\377\377\377\377\250\274\270\377\255\300\275\377\216" \
-  "\333\343\342\377\3\320\332\331\377\223\254\247\377\243\271\264\377\210" \
-  "\377\377\377\377\3\250\274\270\377\223\254\247\377\314\327\325\377\377" \
-  "\333\343\342\377\301\333\343\342\377\4\324\336\334\377\224\255\250\377" \
-  "\233\262\256\377\374\374\374\377\207\377\377\377\377\3\263\304\301\377" \
-  "\223\254\247\377\306\323\321\377\217\333\343\342\377\5\237\265\261\377" \
-  "\252\275\271\377\322\334\332\377\223\254\247\377\275\314\311\377\217" \
-  "\333\343\342\377\3\246\273\267\377\223\254\247\377\342\351\347\377\207" \
-  "\377\377\377\377\3\325\337\335\377\223\254\247\377\256\300\275\377\343" \
-  "\333\343\342\377\6\267\303\301\377\223\244\240\377|\220\214\377\213\235" \
-  "\231\377\250\267\264\377\311\323\322\377\327\333\343\342\377\3\270\310" \
-  "\305\377\223\254\247\377\306\323\321\377\207\377\377\377\377\4\361\364" \
-  "\363\377\223\254\247\377\234\263\257\377\332\342\341\377\217\333\343" \
-  "\342\377\1\307\323\321\377\202\223\254\247\377\2\240\265\261\377\332" \
-  "\342\341\377\217\333\343\342\377\3\304\322\317\377\223\254\247\377\264" \
-  "\306\302\377\207\377\377\377\377\4\373\374\374\377\232\262\255\377\225" \
-  "\255\250\377\325\336\335\377\325\333\343\342\377\1\302\315\313\377\204" \
-  "\222\243\240\377\1\253\271\267\377\205\333\343\342\377\2\323\334\333" \
-  "\377\200\223\220\377\205Slg\377\2Uni\377\247\266\263\377\325\333\343" \
-  "\342\377\4\332\342\341\377\233\262\255\377\224\254\247\377\362\365\364" \
-  "\377\207\377\377\377\377\3\304\322\317\377\223\254\247\377\272\312\307" \
-  "\377\221\333\343\342\377\3\327\337\336\377\326\337\335\377\331\340\337" \
-  "\377\220\333\343\342\377\4\332\342\341\377\233\262\256\377\224\254\247" \
-  "\377\362\365\364\377\207\377\377\377\377\3\304\322\317\377\223\254\247" \
-  "\377\271\311\306\377\325\333\343\342\377\1\211\233\230\377\204Slg\377" \
-  "\1\201\224\220\377\205\333\343\342\377\1\200\223\220\377\210Slg\377\1" \
-  "\227\247\244\377\324\333\343\342\377\3\303\321\317\377\223\254\247\377" \
-  "\265\306\302\377\207\377\377\377\377\4\373\374\374\377\232\261\255\377" \
-  "\225\256\251\377\326\337\336\377\245\333\343\342\377\3\271\311\306\377" \
-  "\223\254\247\377\306\323\320\377\207\377\377\377\377\4\361\364\363\377" \
-  "\223\254\247\377\234\262\256\377\332\342\341\377\323\333\343\342\377" \
-  "\2\330\341\340\377]up\377\203Slg\377\2[sn\377\227\247\244\377\204\333" \
-  "\343\342\377\1\247\266\263\377\212Slg\377\1\305\317\316\377\323\333\343" \
-  "\342\377\3\245\272\266\377\223\254\247\377\342\351\347\377\207\377\377" \
-  "\377\377\3\325\337\335\377\223\254\247\377\256\301\275\377\246\333\343" \
-  "\342\377\4\325\336\335\377\225\255\250\377\233\262\256\377\374\374\374" \
-  "\377\207\377\377\377\377\3\263\304\301\377\223\254\247\377\305\322\320" \
-  "\377\323\333\343\342\377\1\265\302\300\377\202Slg\377\3]up\377\263\300" \
-  "\275\377\332\342\341\377\205\333\343\342\377\1i\177{\377\203Slg\377\5" \
-  "Yrm\377\233\253\250\377\266\302\300\377\246\264\262\377x\214\210\377" \
-  "\202Slg\377\1\204\227\223\377\322\333\343\342\377\3\317\332\330\377\223" \
-  "\254\247\377\243\270\264\377\210\377\377\377\377\3\250\274\270\377\223" \
-  "\254\247\377\315\330\326\377\247\333\343\342\377\3\255\300\274\377\223" \
-  "\254\247\377\330\341\337\377\207\377\377\377\377\3\340\347\346\377\223" \
-  "\254\247\377\247\273\267\377\323\333\343\342\377\4\212\234\231\377Sl" \
-  "g\377Voj\377\307\322\320\377\206\333\343\342\377\1\270\305\303\377\203" \
-  "Slg\377\2Vni\377\303\316\314\377\203\333\343\342\377\5\331\342\341\377" \
-  "\210\233\227\377Slg\377Umh\377\315\327\325\377\321\333\343\342\377\3" \
-  "\261\303\277\377\223\254\247\377\321\333\331\377\207\377\377\377\377" \
-  "\3\347\354\353\377\223\254\247\377\243\270\264\377\250\333\343\342\377" \
-  "\3\314\327\325\377\223\254\247\377\252\275\271\377\207\377\377\377\377" \
-  "\4\376\376\376\377\242\267\263\377\223\254\247\377\320\333\331\377\322" \
-  "\333\343\342\377\3u\211\205\377Slg\377\221\242\237\377\207\333\343\342" \
-  "\377\1\204\227\223\377\203Slg\377\1\221\243\237\377\205\333\343\342\377" \
-  "\4\317\331\327\377Voj\377Slg\377\266\303\301\377\320\333\343\342\377" \
-  "\4\327\340\336\377\226\256\252\377\227\257\253\377\371\372\372\377\207" \
-  "\377\377\377\377\3\271\311\306\377\223\254\247\377\301\317\315\377\251" \
-  "\333\343\342\377\3\241\267\263\377\223\254\247\377\351\356\355\377\207" \
-  "\377\377\377\377\3\317\332\330\377\223\254\247\377\262\304\300\377\322" \
-  "\333\343\342\377\3dzv\377Slg\377\274\307\306\377\206\333\343\342\377" \
-  "\2\331\341\340\377\\to\377\202Slg\377\2Tmh\377\315\327\325\377\206\333" \
-  "\343\342\377\3z\216\212\377Slg\377\246\264\262\377\320\333\343\342\377" \
-  "\3\274\313\311\377\223\254\247\377\277\316\313\377\207\377\377\377\377" \
-  "\4\365\367\367\377\225\255\251\377\231\260\254\377\331\341\340\377\251" \
-  "\333\343\342\377\3\300\316\314\377\223\254\247\377\273\313\310\377\207" \
-  "\377\377\377\377\1\370\371\371\377\202\227\257\252\377\1\327\340\337" \
-  "\377\320\333\343\342\377\4\331\341\340\377Umh\377Slg\377\317\330\327" \
-  "\377\206\333\343\342\377\1\271\306\304\377\203Slg\377\1z\216\212\377" \
-  "\207\333\343\342\377\3\213\235\231\377Slg\377\225\246\243\377\320\333" \
-  "\343\342\377\3\236\265\260\377\223\254\247\377\355\361\360\377\207\377" \
-  "\377\377\377\3\313\327\324\377\223\254\247\377\266\306\303\377\252\333" \
-  "\343\342\377\4\331\341\340\377\230\260\253\377\226\256\251\377\366\370" \
-  "\370\377\207\377\377\377\377\3\275\314\311\377\223\254\247\377\276\315" \
-  "\312\377\320\333\343\342\377\1\324\334\333\377\202Slg\377\1\325\336\335" \
-  "\377\206\333\343\342\377\1\216\240\235\377\203Slg\377\1\255\272\270\377" \
-  "\207\333\343\342\377\3\227\247\244\377Slg\377\210\233\227\377\317\333" \
-  "\343\342\377\3\310\324\322\377\223\254\247\377\256\301\275\377\207\377" \
-  "\377\377\377\4\375\376\375\377\237\265\260\377\224\254\247\377\323\334" \
-  "\333\377\253\333\343\342\377\3\264\305\302\377\223\254\247\377\315\330" \
-  "\326\377\207\377\377\377\377\3\353\357\356\377\223\254\247\377\237\265" \
-  "\261\377\321\333\343\342\377\3\\to\377Slg\377\310\322\321\377\205\333" \
-  "\343\342\377\2\330\341\340\377_vr\377\202Slg\377\2Xpk\377\325\336\335" \
-  "\377\207\333\343\342\377\3\214\235\232\377Slg\377\216\237\234\377\317" \
-  "\333\343\342\377\3\252\275\271\377\223\254\247\377\333\343\342\377\207" \
-  "\377\377\377\377\3\334\344\343\377\223\254\247\377\252\275\272\377\254" \
-  "\333\343\342\377\4\322\334\332\377\223\254\247\377\240\266\262\377\376" \
-  "\376\376\377\207\377\377\377\377\3\254\277\273\377\223\254\247\377\311" \
-  "\325\323\377\320\333\343\342\377\3n\203\177\377Slg\377\257\274\272\377" \
-  "\205\333\343\342\377\1\261\277\274\377\203Slg\377\1\200\223\220\377\210" \
-  "\333\343\342\377\3{\217\213\377Slg\377\227\247\244\377\316\333\343\342" \
-  "\377\4\323\334\333\377\223\254\247\377\236\265\260\377\375\375\375\377" \
-  "\207\377\377\377\377\3\257\301\276\377\223\254\247\377\310\324\322\377" \
-  "\255\333\343\342\377\3\251\274\271\377\223\254\247\377\336\346\344\377" \
-  "\207\377\377\377\377\3\331\342\340\377\223\254\247\377\253\276\273\377" \
-  "\320\333\343\342\377\3\201\224\220\377Slg\377v\212\206\377\204\333\343" \
-  "\342\377\2\330\340\337\377i\200{\377\203Slg\377\1\260\276\273\377\207" \
-  "\333\343\342\377\4\325\335\334\377^uq\377Slg\377\253\271\267\377\316" \
-  "\333\343\342\377\3\265\306\303\377\223\254\247\377\312\326\324\377\207" \
-  "\377\377\377\377\3\356\361\361\377\223\254\247\377\236\265\260\377\256" \
-  "\333\343\342\377\3\307\323\321\377\223\254\247\377\261\303\277\377\207" \
-  "\377\377\377\377\4\374\375\375\377\235\263\257\377\224\255\250\377\323" \
-  "\335\334\377\317\333\343\342\377\1\263\300\275\377\202Slg\377\5\206\231" \
-  "\225\377\314\326\324\377\333\343\342\377\315\327\325\377\177\222\217" \
-  "\377\203Slg\377\2czu\377\331\341\340\377\207\333\343\342\377\1\234\253" \
-  "\251\377\202Slg\377\1\303\316\314\377\315\333\343\342\377\4\331\341\340" \
-  "\377\231\260\254\377\225\255\251\377\365\367\367\377\207\377\377\377" \
-  "\377\3\300\317\314\377\223\254\247\377\275\314\311\377\256\333\343\342" \
-  "\377\4\332\342\341\377\235\264\257\377\223\254\247\377\357\362\362\377" \
-  "\207\377\377\377\377\3\310\325\322\377\223\254\247\377\267\307\304\377" \
-  "\320\333\343\342\377\1m\202~\377\203Slg\377\1Xql\377\205Slg\377\1\235" \
-  "\254\252\377\207\333\343\342\377\4\241\261\256\377Voj\377Slg\377czu\377" \
-  "\316\333\343\342\377\3\301\317\314\377\223\254\247\377\271\311\306\377" \
-  "\207\377\377\377\377\4\371\373\372\377\230\260\253\377\226\256\252\377" \
-  "\327\340\336\377\257\333\343\342\377\3\273\313\310\377\223\254\247\377" \
-  "\302\320\315\377\207\377\377\377\377\4\363\366\366\377\224\255\250\377" \
-  "\232\261\254\377\331\341\340\377\317\333\343\342\377\2\265\302\300\377" \
-  "Voj\377\207Slg\377\2o\205\201\377\330\340\337\377\204\333\343\342\377" \
-  "\3\274\307\306\377\210\233\227\377k\201}\377\203Slg\377\1\221\243\237" \
-  "\377\316\333\343\342\377\3\243\270\264\377\223\254\247\377\346\354\352" \
-  "\377\207\377\377\377\377\3\322\334\332\377\223\254\247\377\261\303\277" \
-  "\377\260\333\343\342\377\4\326\337\336\377\226\256\251\377\231\261\254" \
-  "\377\372\373\373\377\207\377\377\377\377\3\267\307\304\377\223\254\247" \
-  "\377\302\320\316\377\320\333\343\342\377\2\274\310\306\377_wr\377\205" \
-  "Slg\377\2j\200|\377\311\324\322\377\205\333\343\342\377\1\226\247\244" \
-  "\377\205Slg\377\1\300\313\311\377\315\333\343\342\377\3\314\330\326\377" \
-  "\223\254\247\377\247\273\267\377\210\377\377\377\377\3\244\271\265\377" \
-  "\223\254\247\377\317\332\330\377\261\333\343\342\377\3\260\302\276\377" \
-  "\223\254\247\377\324\336\334\377\207\377\377\377\377\3\344\352\351\377" \
-  "\223\254\247\377\244\271\265\377\321\333\343\342\377\7\316\330\326\377" \
-  "\250\266\264\377\214\236\233\377v\213\207\377\206\230\225\377\244\263" \
-  "\260\377\330\341\340\377\206\333\343\342\377\1\243\262\257\377\204l\201" \
-  "}\377\1x\215\211\377\316\333\343\342\377\3\256\301\275\377\223\254\247" \
-  "\377\325\336\334\377\207\377\377\377\377\3\343\351\350\377\223\254\247" \
-  "\377\245\272\266\377\262\333\343\342\377\3\316\331\327\377\223\254\247" \
-  "\377\246\273\267\377\210\377\377\377\377\3\245\272\266\377\223\254\247" \
-  "\377\316\331\327\377\377\333\343\342\377\261\333\343\342\377\4\325\337" \
-  "\335\377\225\255\251\377\232\261\254\377\373\374\373\377\207\377\377" \
-  "\377\377\3\266\307\303\377\223\254\247\377\303\321\317\377\263\333\343" \
-  "\342\377\3\244\271\265\377\223\254\247\377\345\353\352\377\207\377\377" \
-  "\377\377\3\322\335\333\377\223\254\247\377\260\302\276\377\377\333\343" \
-  "\342\377\261\333\343\342\377\3\272\311\307\377\223\254\247\377\303\321" \
-  "\316\377\207\377\377\377\377\4\363\366\365\377\224\255\250\377\232\262" \
-  "\255\377\332\342\341\377\263\333\343\342\377\3\302\320\316\377\223\254" \
-  "\247\377\270\310\305\377\207\377\377\377\377\4\372\373\373\377\231\260" \
-  "\254\377\226\256\251\377\326\337\336\377\377\333\343\342\377\257\333" \
-  "\343\342\377\4\332\342\341\377\234\263\256\377\223\254\247\377\360\363" \
-  "\362\377\207\377\377\377\377\3\307\324\321\377\223\254\247\377\270\310" \
-  "\305\377\264\333\343\342\377\4\331\341\340\377\232\261\254\377\225\255" \
-  "\250\377\364\367\366\377\207\377\377\377\377\3\301\317\314\377\223\254" \
-  "\247\377\273\313\310\377\314\333\343\342\377\3\277\312\310\377\237\256" \
-  "\253\377\254\272\270\377\337\333\343\342\377\3\305\322\320\377\223\254" \
-  "\247\377\262\304\300\377\207\377\377\377\377\4\374\375\374\377\234\263" \
-  "\256\377\224\255\250\377\324\336\334\377\265\333\343\342\377\3\266\307" \
-  "\304\377\223\254\247\377\311\325\323\377\207\377\377\377\377\4\356\362" \
-  "\361\377\223\254\247\377\235\264\257\377\332\342\341\377\313\333\343" \
-  "\342\377\3\233\253\250\377Slg\377p\205\201\377\337\333\343\342\377\3" \
-  "\247\273\267\377\223\254\247\377\337\346\345\377\207\377\377\377\377" \
-  "\3\330\341\337\377\223\254\247\377\254\277\274\377\266\333\343\342\377" \
-  "\4\323\335\334\377\224\255\250\377\235\264\257\377\375\375\375\377\207" \
-  "\377\377\377\377\3\260\302\276\377\223\254\247\377\307\323\321\377\313" \
-  "\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\336\333\343\342" \
-  "\377\4\321\333\331\377\223\254\247\377\241\266\262\377\376\376\376\377" \
-  "\207\377\377\377\377\3\253\276\273\377\223\254\247\377\312\326\324\377" \
-  "\267\333\343\342\377\3\253\276\272\377\223\254\247\377\333\343\341\377" \
-  "\207\377\377\377\377\3\335\345\343\377\223\254\247\377\251\274\271\377" \
-  "\313\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\336\333\343" \
-  "\342\377\3\263\304\301\377\223\254\247\377\315\331\326\377\207\377\377" \
-  "\377\377\3\351\356\355\377\223\254\247\377\241\266\262\377\270\333\343" \
-  "\342\377\3\311\325\323\377\223\254\247\377\254\277\273\377\207\377\377" \
-  "\377\377\4\375\376\375\377\240\265\261\377\223\254\247\377\321\334\332" \
-  "\377\312\333\343\342\377\3\233\253\250\377Slg\377[sn\377\223x\215\211" \
-  "\377\5z\216\212\377\202\225\221\377\214\236\233\377\246\265\262\377\310" \
-  "\323\321\377\305\333\343\342\377\4\330\340\337\377\227\257\252\377\226" \
-  "\256\252\377\367\371\370\377\207\377\377\377\377\3\274\313\310\377\223" \
-  "\254\247\377\277\315\313\377\271\333\343\342\377\3\237\265\261\377\223" \
-  "\254\247\377\353\360\357\377\207\377\377\377\377\3\314\327\325\377\223" \
-  "\254\247\377\264\305\302\377\312\333\343\342\377\1\233\253\250\377\232" \
-  "Slg\377\2x\214\210\377\275\311\307\377\303\333\343\342\377\3\276\315" \
-  "\312\377\223\254\247\377\274\313\310\377\207\377\377\377\377\4\367\371" \
-  "\370\377\226\256\251\377\230\257\253\377\330\341\337\377\271\333\343" \
-  "\342\377\3\275\314\312\377\223\254\247\377\276\315\312\377\207\377\377" \
-  "\377\377\4\366\370\370\377\225\256\251\377\230\260\253\377\330\341\340" \
-  "\377\311\333\343\342\377\1\233\253\250\377\233Slg\377\2Tmh\377\237\256" \
-  "\253\377\302\333\343\342\377\3\240\266\262\377\223\254\247\377\351\356" \
-  "\355\377\207\377\377\377\377\3\315\330\326\377\223\254\247\377\263\305" \
-  "\301\377\272\333\343\342\377\1\327\340\337\377\202\227\257\252\377\1" \
-  "\370\371\371\377\207\377\377\377\377\3\272\312\307\377\223\254\247\377" \
-  "\300\316\314\377\311\333\343\342\377\1\233\253\250\377\235Slg\377\1\243" \
-  "\262\257\377\300\333\343\342\377\3\312\326\324\377\223\254\247\377\252" \
-  "\276\272\377\207\377\377\377\377\4\376\376\376\377\240\266\262\377\223" \
-  "\254\247\377\321\333\332\377\273\333\343\342\377\3\262\303\300\377\223" \
-  "\254\247\377\317\332\330\377\207\377\377\377\377\3\350\355\354\377\223" \
-  "\254\247\377\241\267\263\377\311\333\343\342\377\4\321\332\331\377\305" \
-  "\320\316\377\305\317\316\377\207\231\226\377\202Slg\377\5j\200|\377\224" \
-  "\245\242\377\244\263\260\377\264\300\276\377\302\315\313\377\202\305" \
-  "\320\316\377\16\274\307\306\377\254\272\270\377\235\255\252\377\207\232" \
-  "\226\377Xql\377Slg\377^vq\377\257\274\272\377\305\320\316\377\304\316" \
-  "\315\377\266\303\301\377\247\265\263\377\227\250\245\377s\210\203\377" \
-  "\203Slg\377\2Vni\377\304\317\315\377\277\333\343\342\377\3\254\277\273" \
-  "\377\223\254\247\377\330\341\337\377\207\377\377\377\377\3\336\346\344" \
-  "\377\223\254\247\377\247\273\270\377\274\333\343\342\377\4\320\332\331" \
-  "\377\223\254\247\377\242\270\263\377\376\376\376\377\207\377\377\377" \
-  "\377\3\251\275\271\377\223\254\247\377\313\327\325\377\311\333\343\342" \
-  "\377\5\327\340\337\377y\215\211\377Slg\377q\207\202\377\266\302\300\377" \
-  "\213\333\343\342\377\5\321\333\331\377\233\253\250\377Yrm\377Wpk\377" \
-  "\255\273\271\377\205\333\343\342\377\2\271\305\303\377r\207\203\377\202" \
-  "Slg\377\1\203\226\222\377\276\333\343\342\377\4\324\336\334\377\224\255" \
-  "\250\377\234\263\256\377\374\375\374\377\207\377\377\377\377\3\261\303" \
-  "\277\377\223\254\247\377\306\323\321\377\275\333\343\342\377\3\246\273" \
-  "\267\377\223\254\247\377\340\347\346\377\207\377\377\377\377\3\326\340" \
-  "\336\377\223\254\247\377\255\300\274\377\311\333\343\342\377\4\211\234" \
-  "\230\377Slg\377n\204\200\377\325\336\335\377\216\333\343\342\377\4\263" \
-  "\300\275\377Tlg\377Wpk\377\300\314\312\377\205\333\343\342\377\5\325" \
-  "\335\334\377f}x\377Slg\377Umh\377\324\334\333\377\275\333\343\342\377" \
-  "\3\267\310\305\377\223\254\247\377\307\324\321\377\207\377\377\377\377" \
-  "\4\357\363\362\377\223\254\247\377\234\263\257\377\332\342\341\377\275" \
-  "\333\343\342\377\3\304\322\317\377\223\254\247\377\263\304\301\377\207" \
-  "\377\377\377\377\4\373\374\374\377\233\262\255\377\225\255\250\377\325" \
-  "\336\335\377\307\333\343\342\377\4\275\311\307\377Slg\377\\so\377\316" \
-  "\327\326\377\220\333\343\342\377\3\227\250\245\377Slg\377p\206\202\377" \
-  "\206\333\343\342\377\4\276\312\310\377Tlg\377Slg\377\266\302\300\377" \
-  "\274\333\343\342\377\4\331\342\341\377\232\261\255\377\224\254\247\377" \
-  "\362\365\364\377\207\377\377\377\377\3\302\320\315\377\223\254\247\377" \
-  "\272\312\307\377\276\333\343\342\377\4\332\342\341\377\233\262\256\377" \
-  "\223\254\247\377\361\364\363\377\207\377\377\377\377\3\305\322\320\377" \
-  "\223\254\247\377\271\311\306\377\307\333\343\342\377\3\211\233\230\377" \
-  "Slg\377|\217\214\377\221\333\343\342\377\1\304\317\315\377\202Slg\377" \
-  "\1\305\317\316\377\206\333\343\342\377\3f}x\377Slg\377\235\254\252\377" \
-  "\274\333\343\342\377\3\303\320\316\377\223\254\247\377\265\306\302\377" \
-  "\207\377\377\377\377\4\372\373\373\377\231\261\254\377\225\255\251\377" \
-  "\326\337\336\377\277\333\343\342\377\3\271\311\306\377\223\254\247\377" \
-  "\304\322\317\377\207\377\377\377\377\4\361\364\363\377\223\254\247\377" \
-  "\233\262\256\377\332\342\341\377\306\333\343\342\377\3e{w\377Slg\377" \
-  "\227\250\245\377\221\333\343\342\377\4\331\342\341\377Xql\377Slg\377" \
-  "\241\261\256\377\206\333\343\342\377\3}\221\215\377Slg\377\221\242\237" \
-  "\377\274\333\343\342\377\3\245\271\265\377\223\254\247\377\343\351\350" \
-  "\377\207\377\377\377\377\3\324\336\334\377\223\254\247\377\256\301\275" \
-  "\377\300\333\343\342\377\4\325\336\335\377\225\255\250\377\232\262\255" \
-  "\377\373\374\374\377\207\377\377\377\377\3\264\305\301\377\223\254\247" \
-  "\377\304\321\317\377\305\333\343\342\377\4\332\342\341\377Vni\377Slg" \
-  "\377\243\262\257\377\222\333\343\342\377\3czu\377Slg\377\223\244\241" \
-  "\377\206\333\343\342\377\3\224\244\241\377Slg\377\210\233\227\377\273" \
-  "\333\343\342\377\3\316\331\330\377\223\254\247\377\244\271\264\377\210" \
-  "\377\377\377\377\3\246\273\267\377\223\254\247\377\315\330\326\377\301" \
-  "\333\343\342\377\4\255\300\274\377\222\253\246\377\315\330\326\377\376" \
-  "\376\376\377\206\377\377\377\377\3\341\350\346\377\223\254\247\377\246" \
-  "\272\266\377\305\333\343\342\377\1\322\333\332\377\202Slg\377\1\205\230" \
-  "\224\377\221\333\343\342\377\1\316\327\326\377\202Slg\377\1\211\234\230" \
-  "\377\206\333\343\342\377\3\220\242\236\377Slg\377\222\243\240\377\273" \
-  "\333\343\342\377\3\260\302\277\377\223\254\247\377\321\334\332\377\207" \
-  "\377\377\377\377\3\345\353\352\377\223\254\247\377\243\270\264\377\302" \
-  "\333\343\342\377\16\314\327\325\377\223\254\246\377\223\254\247\377\226" \
-  "\256\251\377\244\271\265\377\264\305\302\377\303\321\316\377\323\335" \
-  "\333\377\342\351\350\377\361\365\364\377\375\375\375\377\242\270\263" \
-  "\377\223\254\247\377\317\332\330\377\304\333\343\342\377\4\332\342\341" \
-  "\377Vni\377Slg\377f|x\377\221\333\343\342\377\1\256\274\271\377\202S" \
-  "lg\377\1\226\246\243\377\206\333\343\342\377\3\202\225\221\377Slg\377" \
-  "\237\257\254\377\272\333\343\342\377\4\327\337\336\377\226\256\251\377" \
-  "\230\260\253\377\371\372\372\377\207\377\377\377\377\3\270\310\305\377" \
-  "\223\254\247\377\301\317\315\377\303\333\343\342\377\15\232\262\255\377" \
-  "\223\254\246\377\325\336\335\377\331\342\340\377\312\326\324\377\273" \
-  "\313\310\377\254\277\273\377\235\263\257\377\223\254\247\377\226\256" \
-  "\251\377\234\263\256\377\222\254\246\377\256\300\274\377\305\333\343" \
-  "\342\377\1i\200{\377\202Slg\377\1\224\244\241\377\217\333\343\342\377" \
-  "\2\313\325\323\377czu\377\202Slg\377\1\253\271\266\377\205\333\343\342" \
-  "\377\4\331\341\340\377czu\377Slg\377\254\272\270\377\272\333\343\342" \
-  "\377\3\274\313\310\377\223\254\247\377\277\316\313\377\207\377\377\377" \
-  "\377\4\364\367\366\377\225\255\250\377\231\260\254\377\331\341\340\377" \
-  "\303\333\343\342\377\3\275\313\311\377\222\254\246\377\257\301\276\377" \
-  "\205\377\377\377\377\3\372\373\373\377\353\360\357\377\327\340\335\377" \
-  "\202\224\255\250\377\3\327\340\337\377\331\342\341\377\322\334\333\377" \
-  "\302\333\343\342\377\1\226\247\244\377\203Slg\377\2\231\252\247\377\330" \
-  "\341\340\377\214\333\343\342\377\2\310\323\321\377f|x\377\202Slg\377" \
-  "\2Voj\377\323\334\332\377\205\333\343\342\377\1\253\271\266\377\202S" \
-  "lg\377\1\272\306\304\377\272\333\343\342\377\3\236\264\260\377\223\254" \
-  "\247\377\355\361\360\377\207\377\377\377\377\3\311\325\323\377\223\254" \
-  "\247\377\266\306\303\377\304\333\343\342\377\4\331\341\340\377\224\255" \
-  "\250\377\224\254\247\377\366\370\367\377\207\377\377\377\377\5\263\305" \
-  "\301\377\222\254\246\377\266\306\302\377\232\262\254\377\240\266\262" \
-  "\377\302\333\343\342\377\2\314\325\324\377Xql\377\203Slg\377\4_wr\377" \
-  "\221\243\237\377\304\316\315\377\330\341\340\377\206\333\343\342\377" \
-  "\4\322\333\332\377\254\271\267\377w\214\210\377Tlg\377\203Slg\377\1\211" \
-  "\233\230\377\205\333\343\342\377\5\263\300\276\377Xql\377Slg\377Xql\377" \
-  "\326\336\335\377\271\333\343\342\377\3\310\324\322\377\223\254\247\377" \
-  "\256\301\275\377\207\377\377\377\377\4\375\375\375\377\235\264\257\377" \
-  "\223\254\247\377\323\334\333\377\305\333\343\342\377\3\256\300\276\377" \
-  "\223\253\246\377\305\322\320\377\207\377\377\377\377\6\353\360\357\377" \
-  "\222\254\247\377\231\261\255\377\241\267\262\377\223\254\247\377\312" \
-  "\326\324\377\302\333\343\342\377\1\237\256\253\377\206Slg\377\7Tlg\377" \
-  "^vq\377l\202~\377y\215\211\377s\210\203\377e|w\377Xpk\377\206Slg\377" \
-  "\2_wr\377\321\333\331\377\203\333\343\342\377\2\255\272\270\377q\207" \
-  "\202\377\203Slg\377\1~\222\216\377\272\333\343\342\377\3\251\275\271" \
-  "\377\223\254\247\377\334\344\342\377\207\377\377\377\377\3\333\343\341" \
-  "\377\223\254\247\377\252\275\271\377\306\333\343\342\377\4\322\334\332" \
-  "\377\223\253\246\377\231\260\253\377\375\376\375\377\207\377\377\377" \
-  "\377\5\242\267\263\377\222\253\246\377\265\305\302\377\223\254\247\377" \
-  "\254\277\273\377\303\333\343\342\377\1\220\242\236\377\221Slg\377\2_" \
-  "vr\377\304\316\315\377\204\333\343\342\377\1}\220\215\377\204Slg\377" \
-  "\1\251\267\265\377\271\333\343\342\377\4\322\334\333\377\223\254\247" \
-  "\377\236\265\260\377\375\376\375\377\207\377\377\377\377\3\255\300\274" \
-  "\377\223\254\247\377\310\324\322\377\307\333\343\342\377\3\241\266\263" \
-  "\377\223\253\247\377\332\342\341\377\203\377\377\377\377\2\371\372\372" \
-  "\377\364\367\366\377\202\377\377\377\377\6\326\340\336\377\222\254\246" \
-  "\377\243\270\263\377\230\260\253\377\225\255\250\377\324\336\334\377" \
-  "\303\333\343\342\377\2\242\261\256\377Yql\377\216Slg\377\2s\210\204\377" \
-  "\310\322\321\377\205\333\343\342\377\1\235\255\252\377\204\201\224\220" \
-  "\377\1\321\333\331\377\271\333\343\342\377\3\265\306\302\377\223\254" \
-  "\247\377\312\326\324\377\207\377\377\377\377\3\354\360\357\377\223\254" \
-  "\247\377\236\265\260\377\310\333\343\342\377\3\306\322\320\377\222\253" \
-  "\246\377\244\271\266\377\203\377\377\377\377\2\244\271\264\377\272\312" \
-  "\307\377\202\377\377\377\377\6\374\375\375\377\227\257\252\377\223\254" \
-  "\246\377\260\303\277\377\223\254\247\377\267\310\305\377\304\333\343" \
-  "\342\377\3\313\325\323\377\212\234\231\377Yrm\377\212Slg\377\3n\203\177" \
-  "\377\247\266\263\377\332\342\341\377\304\333\343\342\377\4\331\341\340" \
-  "\377\230\260\253\377\225\255\251\377\365\367\367\377\207\377\377\377" \
-  "\377\3\277\315\312\377\223\254\247\377\275\314\311\377\310\333\343\342" \
-  "\377\4\332\342\341\377\227\257\253\377\223\253\246\377\356\361\361\377" \
-  "\202\377\377\377\377\3\312\326\324\377\226\256\251\377\367\370\370\377" \
-  "\202\377\377\377\377\6\300\316\314\377\223\253\246\377\226\256\250\377" \
-  "\223\254\247\377\233\261\255\377\332\342\341\377\305\333\343\342\377" \
-  "\13\324\335\334\377\261\277\274\377\224\244\241\377|\217\214\377r\207" \
-  "\203\377j\200|\377n\203\177\377v\213\207\377\205\227\224\377\242\261" \
-  "\256\377\303\316\314\377\307\333\343\342\377\3\301\317\314\377\223\254" \
-  "\247\377\271\311\306\377\207\377\377\377\377\4\370\372\371\377\227\257" \
-  "\252\377\226\256\252\377\327\340\336\377\311\333\343\342\377\3\267\310" \
-  "\305\377\223\253\246\377\266\307\304\377\202\377\377\377\377\3\365\367" \
-  "\367\377\225\256\251\377\315\330\326\377\202\377\377\377\377\6\364\366" \
-  "\366\377\223\254\246\377\223\253\247\377\235\263\260\377\223\254\247" \
-  "\377\303\321\317\377\377\333\343\342\377\230\333\343\342\377\3\242\267" \
-  "\263\377\223\254\247\377\346\354\353\377\207\377\377\377\377\3\320\333" \
-  "\331\377\223\254\247\377\261\303\277\377\312\333\343\342\377\4\326\337" \
-  "\336\377\223\254\247\377\224\255\250\377\371\373\372\377\202\377\377" \
-  "\377\377\3\271\311\306\377\241\266\262\377\376\376\376\377\202\377\377" \
-  "\377\377\5\253\277\273\377\223\253\247\377\263\305\302\377\223\254\247" \
-  "\377\245\271\265\377\377\333\343\342\377\227\333\343\342\377\3\314\330" \
-  "\326\377\223\254\247\377\247\273\267\377\207\377\377\377\377\4\376\376" \
-  "\376\377\243\270\264\377\223\254\247\377\317\332\330\377\313\333\343" \
-  "\342\377\3\251\274\270\377\222\254\247\377\315\330\325\377\202\377\377" \
-  "\377\377\3\346\354\353\377\223\254\247\377\337\346\345\377\202\377\377" \
-  "\377\377\2\344\352\350\377\223\254\246\377\202\235\263\257\377\2\223" \
-  "\254\247\377\316\331\330\377\377\333\343\342\377\226\333\343\342\377" \
-  "\3\256\300\275\377\223\254\247\377\325\337\335\377\207\377\377\377\377" \
-  "\3\341\350\347\377\223\254\247\377\245\272\266\377\314\333\343\342\377" \
-  "\3\316\331\327\377\222\253\246\377\234\263\256\377\203\377\377\377\377" \
-  "\2\247\274\270\377\261\303\300\377\203\377\377\377\377\5\234\263\256" \
-  "\377\223\253\246\377\263\305\301\377\223\254\247\377\260\303\277\377" \
-  "\322\333\343\342\377\1\304\317\315\377\202\201\224\220\377\277\333\343" \
-  "\342\377\4\325\336\335\377\225\255\250\377\232\261\255\377\373\374\373" \
-  "\377\207\377\377\377\377\3\264\305\302\377\223\254\247\377\303\321\317" \
-  "\377\315\333\343\342\377\3\235\263\260\377\223\253\246\377\342\351\347" \
-  "\377\202\377\377\377\377\3\325\336\334\377\223\254\247\377\360\363\363" \
-  "\377\202\377\377\377\377\5\315\330\326\377\223\253\246\377\247\274\267" \
-  "\377\227\256\251\377\253\276\273\377\322\333\343\342\377\1\270\305\303" \
-  "\377\202Slg\377\277\333\343\342\377\3\271\311\306\377\223\254\247\377" \
-  "\303\321\316\377\207\377\377\377\377\4\361\364\364\377\224\254\247\377" \
-  "\232\262\255\377\332\342\341\377\315\333\343\342\377\3\300\317\315\377" \
-  "\223\254\246\377\253\277\272\377\202\377\377\377\377\3\373\374\374\377" \
-  "\232\262\255\377\303\321\316\377\202\377\377\377\377\4\372\373\373\377" \
-  "\225\255\251\377\224\254\247\377\321\333\332\377\323\333\343\342\377" \
-  "\1\270\305\303\377\202Slg\377\276\333\343\342\377\4\332\342\341\377\234" \
-  "\263\256\377\223\254\247\377\360\363\363\377\207\377\377\377\377\3\305" \
-  "\323\320\377\223\254\247\377\270\310\305\377\316\333\343\342\377\4\331" \
-  "\341\340\377\226\255\251\377\223\253\247\377\363\366\365\377\202\377" \
-  "\377\377\377\3\304\321\317\377\232\262\255\377\373\374\374\377\202\377" \
-  "\377\377\377\3\267\310\304\377\222\253\246\377\270\310\304\377\306\333" \
-  "\343\342\377\2\317\331\327\377\301\314\312\377\213\275\310\306\377\1" \
-  "\242\261\256\377\202Slg\377\276\333\343\342\377\3\305\322\320\377\223" \
-  "\254\247\377\262\304\300\377\207\377\377\377\377\4\374\374\374\377\233" \
-  "\262\255\377\224\255\250\377\324\336\334\377\317\333\343\342\377\3\261" \
-  "\303\300\377\223\253\246\377\276\315\313\377\202\377\377\377\377\3\360" \
-  "\364\363\377\223\254\247\377\325\337\335\377\202\377\377\377\377\4\357" \
-  "\362\362\377\222\253\246\377\231\260\253\377\332\342\341\377\301\333" \
-  "\343\342\377\4\305\320\316\377\204\227\223\377e|w\377Voj\377\220Slg\377" \
-  "\276\333\343\342\377\3\247\273\267\377\223\254\247\377\340\347\345\377" \
-  "\207\377\377\377\377\3\327\340\336\377\223\254\247\377\254\277\274\377" \
-  "\320\333\343\342\377\4\323\335\334\377\223\253\247\377\226\256\252\377" \
-  "\374\375\374\377\202\377\377\377\377\2\262\304\301\377\250\274\270\377" \
-  "\202\377\377\377\377\4\354\360\357\377\232\262\255\377\223\253\247\377" \
-  "\306\323\321\377\277\333\343\342\377\3\325\335\334\377\202\225\221\377" \
-  "Tlg\377\223Slg\377\275\333\343\342\377\4\320\333\331\377\223\254\247" \
-  "\377\241\267\262\377\376\376\376\377\207\377\377\377\377\3\251\275\271" \
-  "\377\223\254\247\377\312\326\324\377\321\333\343\342\377\3\244\271\264" \
-  "\377\223\254\247\377\325\337\335\377\202\377\377\377\377\10\340\347\346" \
-  "\377\223\254\247\377\312\327\324\377\255\300\274\377\226\256\251\377" \
-  "\255\277\274\377\222\254\247\377\250\274\270\377\277\333\343\342\377" \
-  "\1\207\232\226\377\225Slg\377\275\333\343\342\377\3\262\304\300\377\223" \
-  "\254\247\377\316\331\327\377\207\377\377\377\377\3\350\355\354\377\223" \
-  "\254\247\377\240\266\262\377\322\333\343\342\377\16\311\325\323\377\223" \
-  "\254\246\377\241\266\263\377\377\377\377\377\364\367\366\377\310\325" \
-  "\322\377\227\257\252\377\234\263\256\377\312\327\324\377\365\370\367" \
-  "\377\376\376\376\377\240\266\261\377\223\254\247\377\321\333\332\377" \
-  "\275\333\343\342\377\1\257\275\272\377\205Slg\377\4Voj\377axt\377k\201" \
-  "|\377t\211\205\377\212x\215\211\377\1o\204\200\377\202Slg\377\274\333" \
-  "\343\342\377\4\330\340\337\377\227\257\252\377\226\256\252\377\367\371" \
-  "\371\377\207\377\377\377\377\3\273\312\307\377\223\254\247\377\277\315" \
-  "\313\377\323\333\343\342\377\7\231\260\254\377\223\253\247\377\260\302" \
-  "\276\377\225\256\251\377\257\301\276\377\334\344\343\377\376\376\376" \
-  "\377\203\377\377\377\377\3\315\330\326\377\223\254\247\377\264\305\302" \
-  "\377\275\333\343\342\377\1\201\225\221\377\203Slg\377\3~\222\216\377" \
-  "\261\277\274\377\327\340\337\377\215\333\343\342\377\1\270\305\303\377" \
-  "\202Slg\377\274\333\343\342\377\3\276\315\312\377\223\254\247\377\274" \
-  "\314\311\377\207\377\377\377\377\4\366\370\370\377\225\256\251\377\230" \
-  "\257\253\377\330\341\337\377\323\333\343\342\377\4\273\312\310\377\222" \
-  "\254\246\377\244\271\265\377\356\362\361\377\206\377\377\377\377\4\366" \
-  "\370\370\377\226\256\251\377\230\257\253\377\330\341\340\377\274\333" \
-  "\343\342\377\1i\200{\377\202Slg\377\1\204\226\223\377\220\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\274\333\343\342\377\3\237\265\261\377" \
-  "\223\254\247\377\352\357\356\377\207\377\377\377\377\3\314\330\325\377" \
-  "\223\254\247\377\263\304\301\377\324\333\343\342\377\4\327\340\337\377" \
-  "\227\257\252\377\226\256\252\377\367\371\371\377\207\377\377\377\377" \
-  "\3\273\313\310\377\223\254\247\377\277\316\313\377\273\333\343\342\377" \
-  "\2\330\340\337\377Uni\377\202Slg\377\1\321\333\331\377\220\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\273\333\343\342\377\3\312\326\324\377" \
-  "\223\254\247\377\253\276\273\377\207\377\377\377\377\4\376\376\376\377" \
-  "\240\265\261\377\223\254\247\377\321\333\332\377\325\333\343\342\377" \
-  "\3\262\303\300\377\223\254\247\377\316\331\327\377\207\377\377\377\377" \
-  "\3\350\356\355\377\223\254\247\377\241\267\262\377\273\333\343\342\377" \
-  "\4\326\337\336\377Tlg\377Slg\377byt\377\221\333\343\342\377\1\330\341" \
-  "\340\377\202\322\333\332\377\273\333\343\342\377\3\253\276\273\377\223" \
-  "\254\247\377\330\341\337\377\207\377\377\377\377\3\335\345\344\377\223" \
-  "\254\247\377\247\273\270\377\326\333\343\342\377\4\320\332\331\377\223" \
-  "\254\247\377\241\267\262\377\376\376\376\377\207\377\377\377\377\3\252" \
-  "\275\271\377\223\254\247\377\313\326\325\377\273\333\343\342\377\3cz" \
-  "u\377Slg\377l\202~\377\316\333\343\342\377\4\323\335\334\377\224\255" \
-  "\250\377\234\263\256\377\374\375\374\377\207\377\377\377\377\3\260\302" \
-  "\276\377\223\254\247\377\306\323\321\377\327\333\343\342\377\3\246\273" \
-  "\267\377\223\254\247\377\340\347\345\377\207\377\377\377\377\3\327\340" \
-  "\336\377\223\254\247\377\254\277\274\377\273\333\343\342\377\4\207\231" \
-  "\226\377Slg\377Vni\377\327\337\336\377\315\333\343\342\377\3\267\307" \
-  "\304\377\223\254\247\377\307\324\321\377\207\377\377\377\377\4\356\362" \
-  "\361\377\223\254\247\377\234\263\257\377\332\342\341\377\327\333\343" \
-  "\342\377\3\304\322\317\377\223\254\247\377\262\304\300\377\207\377\377" \
-  "\377\377\4\374\374\374\377\233\262\256\377\224\255\250\377\325\336\335" \
-  "\377\272\333\343\342\377\1\305\317\316\377\202Slg\377\1\271\306\304\377" \
-  "\220\333\343\342\377\1\307\322\320\377\202\216\237\234\377\271\333\343" \
-  "\342\377\4\331\342\341\377\232\261\255\377\224\255\250\377\363\366\365" \
-  "\377\207\377\377\377\377\3\302\320\315\377\223\254\247\377\272\312\307" \
-  "\377\330\333\343\342\377\4\332\342\341\377\233\262\256\377\223\254\247" \
-  "\377\360\363\363\377\207\377\377\377\377\3\306\323\320\377\223\254\247" \
-  "\377\270\310\305\377\273\333\343\342\377\4\232\252\247\377Slg\377d{v" \
-  "\377\317\330\327\377\217\333\343\342\377\1\270\305\303\377\202Slg\377" \
-  "\271\333\343\342\377\3\303\320\316\377\223\254\247\377\266\307\303\377" \
-  "\207\377\377\377\377\4\372\373\373\377\231\260\254\377\225\255\251\377" \
-  "\326\337\336\377\331\333\343\342\377\3\271\311\306\377\223\254\247\377" \
-  "\303\321\316\377\207\377\377\377\377\4\362\365\364\377\224\254\247\377" \
-  "\233\262\255\377\332\342\341\377\273\333\343\342\377\4\226\246\243\377" \
-  "Tmh\377l\201}\377\267\303\301\377\216\333\343\342\377\1\270\305\303\377" \
-  "\202Slg\377\271\333\343\342\377\3\244\271\265\377\223\254\247\377\343" \
-  "\352\350\377\207\377\377\377\377\3\323\335\333\377\223\254\247\377\256" \
-  "\301\275\377\332\333\343\342\377\4\325\336\335\377\225\255\250\377\232" \
-  "\261\254\377\373\374\373\377\207\377\377\377\377\3\264\306\302\377\223" \
-  "\254\247\377\304\321\317\377\271\333\343\342\377\1\317\330\327\377\202" \
-  "\301\314\312\377\10\246\265\262\377^vq\377Slg\377k\201}\377\226\247\244" \
-  "\377\245\264\261\377\263\300\276\377\277\313\311\377\211\301\314\312" \
-  "\377\1\245\264\261\377\202Slg\377\270\333\343\342\377\3\316\331\327\377" \
-  "\223\254\247\377\245\271\265\377\210\377\377\377\377\3\246\272\266\377" \
-  "\223\254\247\377\315\330\326\377\333\333\343\342\377\3\255\300\274\377" \
-  "\223\254\247\377\325\336\334\377\207\377\377\377\377\3\342\350\347\377" \
-  "\223\254\247\377\245\272\266\377\271\333\343\342\377\1\233\253\250\377" \
-  "\226Slg\377\270\333\343\342\377\3\260\302\276\377\223\254\247\377\322" \
-  "\334\332\377\207\377\377\377\377\3\344\352\351\377\223\254\247\377\243" \
-  "\270\264\377\334\333\343\342\377\3\314\327\325\377\223\254\247\377\247" \
-  "\273\267\377\207\377\377\377\377\4\376\376\376\377\243\270\264\377\223" \
-  "\254\247\377\317\332\330\377\270\333\343\342\377\1\233\253\250\377\226" \
-  "Slg\377\267\333\343\342\377\4\326\337\336\377\226\256\251\377\230\260" \
-  "\253\377\371\373\372\377\207\377\377\377\377\3\267\307\304\377\223\254" \
-  "\247\377\301\317\315\377\335\333\343\342\377\3\241\267\263\377\223\254" \
-  "\247\377\346\354\353\377\207\377\377\377\377\3\320\333\331\377\223\254" \
-  "\247\377\261\303\277\377\270\333\343\342\377\1\233\253\250\377\226Sl" \
-  "g\377\267\333\343\342\377\3\273\313\310\377\223\254\247\377\300\317\314" \
-  "\377\207\377\377\377\377\4\363\366\366\377\224\255\250\377\231\260\254" \
-  "\377\331\341\340\377\335\333\343\342\377\3\300\316\314\377\223\254\247" \
-  "\377\271\311\306\377\207\377\377\377\377\4\371\372\372\377\227\257\253" \
-  "\377\226\256\252\377\327\340\337\377\267\333\343\342\377\3\233\253\250" \
-  "\377Slg\377[sn\377\221x\215\211\377\1o\204\200\377\202Slg\377\266\333" \
-  "\343\342\377\4\332\342\341\377\235\264\257\377\223\254\247\377\356\361" \
-  "\361\377\207\377\377\377\377\3\310\325\322\377\223\254\247\377\266\306" \
-  "\303\377\336\333\343\342\377\4\330\341\340\377\230\260\253\377\225\255" \
-  "\251\377\365\367\367\377\207\377\377\377\377\3\277\316\313\377\223\254" \
-  "\247\377\275\314\311\377\267\333\343\342\377\3\233\253\250\377Slg\377" \
-  "p\205\201\377\221\333\343\342\377\1\270\305\303\377\202Slg\377\266\333" \
-  "\343\342\377\3\307\324\322\377\223\254\247\377\257\301\276\377\207\377" \
-  "\377\377\377\4\374\375\375\377\235\264\257\377\223\254\247\377\323\334" \
-  "\333\377\337\333\343\342\377\3\264\305\302\377\223\254\247\377\312\326" \
-  "\324\377\207\377\377\377\377\3\354\361\360\377\223\254\247\377\236\265" \
-  "\260\377\267\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\221" \
-  "\333\343\342\377\1\270\305\303\377\202Slg\377\266\333\343\342\377\3\251" \
-  "\274\271\377\223\254\247\377\334\344\343\377\207\377\377\377\377\3\332" \
-  "\342\340\377\223\254\247\377\252\275\271\377\340\333\343\342\377\4\322" \
-  "\334\332\377\223\254\247\377\236\265\260\377\375\375\375\377\207\377" \
-  "\377\377\377\3\256\300\275\377\223\254\247\377\310\324\322\377\266\333" \
-  "\343\342\377\3\233\253\250\377Slg\377p\205\201\377\221\333\343\342\377" \
-  "\1\270\305\303\377\202Slg\377\265\333\343\342\377\4\322\334\332\377\223" \
-  "\254\247\377\237\265\260\377\375\376\375\377\207\377\377\377\377\3\254" \
-  "\277\273\377\223\254\247\377\310\324\322\377\341\333\343\342\377\3\251" \
-  "\274\271\377\223\254\247\377\333\343\342\377\207\377\377\377\377\3\333" \
-  "\343\342\377\223\254\247\377\252\275\272\377\266\333\343\342\377\3\277" \
-  "\312\310\377\237\256\253\377\254\272\270\377\221\333\343\342\377\1\323" \
-  "\334\333\377\202\275\310\306\377\265\333\343\342\377\3\264\305\302\377" \
-  "\223\254\247\377\313\327\324\377\207\377\377\377\377\3\353\360\357\377" \
-  "\223\254\247\377\236\265\260\377\342\333\343\342\377\3\307\323\321\377" \
-  "\223\254\247\377\256\301\275\377\207\377\377\377\377\4\375\375\375\377" \
-  "\236\264\260\377\224\254\247\377\323\334\333\377\377\333\343\342\377" \
-  "\5\333\343\342\377\331\341\340\377\230\260\253\377\225\256\251\377\366" \
-  "\370\367\377\207\377\377\377\377\3\275\314\311\377\223\254\247\377\274" \
-  "\313\311\377\342\333\343\342\377\4\332\342\341\377\235\264\257\377\223" \
-  "\254\247\377\355\361\360\377\207\377\377\377\377\3\312\326\323\377\223" \
-  "\254\247\377\266\306\303\377\377\333\343\342\377\4\333\343\342\377\300" \
-  "\316\314\377\223\254\247\377\271\311\306\377\207\377\377\377\377\4\370" \
-  "\371\371\377\227\257\252\377\226\256\252\377\327\340\336\377\343\333" \
-  "\343\342\377\3\273\313\310\377\223\254\247\377\277\316\313\377\207\377" \
-  "\377\377\377\4\364\367\366\377\225\255\250\377\231\260\254\377\331\341" \
-  "\340\377\310\333\343\342\377\3\307\322\320\377\305\320\316\377\324\334" \
-  "\333\377\264\333\343\342\377\3\241\267\263\377\223\254\247\377\347\354" \
-  "\353\377\207\377\377\377\377\3\317\332\330\377\223\254\247\377\261\303" \
-  "\277\377\344\333\343\342\377\4\326\337\336\377\226\256\251\377\227\257" \
-  "\253\377\371\372\372\377\207\377\377\377\377\3\270\310\305\377\223\254" \
-  "\247\377\301\317\315\377\310\333\343\342\377\3_vr\377Slg\377\254\271" \
-  "\267\377\263\333\343\342\377\3\314\327\325\377\223\254\247\377\250\274" \
-  "\270\377\207\377\377\377\377\4\376\376\376\377\242\270\263\377\223\254" \
-  "\247\377\317\332\330\377\345\333\343\342\377\3\260\302\276\377\223\254" \
-  "\247\377\321\333\331\377\207\377\377\377\377\3\346\353\352\377\223\254" \
-  "\247\377\243\270\264\377\310\333\343\342\377\3_vr\377Slg\377\254\271" \
-  "\267\377\263\333\343\342\377\3\255\300\274\377\223\254\247\377\325\337" \
-  "\335\377\207\377\377\377\377\3\340\347\346\377\223\254\247\377\245\272" \
-  "\266\377\346\333\343\342\377\3\316\331\327\377\223\254\247\377\244\271" \
-  "\265\377\210\377\377\377\377\3\247\273\267\377\223\254\247\377\315\330" \
-  "\326\377\307\333\343\342\377\3^vq\377Slg\377\254\271\267\377\262\333" \
-  "\343\342\377\4\325\336\335\377\225\255\250\377\232\261\255\377\373\374" \
-  "\374\377\207\377\377\377\377\3\263\304\301\377\223\254\247\377\303\321" \
-  "\317\377\347\333\343\342\377\3\244\271\265\377\223\254\247\377\342\351" \
-  "\347\377\207\377\377\377\377\3\324\336\334\377\223\254\247\377\256\301" \
-  "\275\377\304\333\343\342\377\3\317\331\327\377\236\255\253\377i\177{" \
-  "\377\202Slg\377\1\254\271\267\377\262\333\343\342\377\3\271\311\306\377" \
-  "\223\254\247\377\304\322\317\377\207\377\377\377\377\4\361\364\363\377" \
-  "\223\254\247\377\226\256\251\377\332\342\341\377\347\333\343\342\377" \
-  "\3\302\320\316\377\223\254\247\377\265\306\302\377\202\377\377\377\377" \
-  "\3\371\373\372\377\356\361\361\377\375\375\375\377\202\377\377\377\377" \
-  "\4\372\373\373\377\232\261\254\377\225\255\251\377\326\337\336\377\300" \
-  "\333\343\342\377\4\331\341\340\377\263\300\276\377~\222\216\377Uni\377" \
-  "\204Slg\377\1\254\271\267\377\261\333\343\342\377\4\332\342\341\377\233" \
-  "\262\256\377\223\254\247\377\361\364\363\377\207\377\377\377\377\1\304" \
-  "\322\317\377\202\223\254\247\377\1\312\326\324\377\347\333\343\342\377" \
-  "\5\331\341\340\377\232\261\254\377\223\254\247\377\302\320\315\377\244" \
-  "\271\265\377\202\223\254\247\377\7\226\256\251\377\251\275\271\377\331" \
-  "\342\340\377\377\377\377\377\303\321\316\377\223\254\247\377\272\312" \
-  "\307\377\276\333\343\342\377\3\310\322\321\377\224\244\241\377axt\377" \
-  "\207Slg\377\1\254\271\267\377\261\333\343\342\377\3\304\322\317\377\223" \
-  "\254\247\377\263\304\301\377\207\377\377\377\377\5\373\374\374\377\233" \
-  "\262\255\377\225\255\251\377\233\262\256\377\264\305\302\377\350\333" \
-  "\343\342\377\1\260\303\277\377\202\224\255\250\377\13\277\315\312\377" \
-  "\330\341\337\377\345\353\351\377\322\334\332\377\263\304\301\377\223" \
-  "\254\247\377\267\307\304\377\353\357\356\377\223\254\247\377\234\263" \
-  "\257\377\332\342\341\377\272\333\343\342\377\3\326\336\335\377\251\267" \
-  "\265\377t\211\205\377\212Slg\377\1\254\271\267\377\261\333\343\342\377" \
-  "\3\246\272\266\377\223\254\247\377\340\347\346\377\207\377\377\377\377" \
-  "\5\326\337\335\377\223\254\247\377\271\311\306\377\262\304\300\377\246" \
-  "\272\266\377\347\333\343\342\377\4\331\341\340\377\236\264\260\377\240" \
-  "\266\261\377\351\356\355\377\205\377\377\377\377\6\330\341\337\377\226" \
-  "\256\252\377\275\314\311\377\261\303\300\377\223\254\247\377\306\323" \
-  "\320\377\270\333\343\342\377\3\276\312\310\377\211\234\230\377[sn\377" \
-  "\211Slg\377\4Voj\377Umh\377Slg\377\254\271\267\377\260\333\343\342\377" \
-  "\4\320\332\331\377\223\254\247\377\242\267\263\377\376\376\376\377\207" \
-  "\377\377\377\377\5\250\274\270\377\223\254\247\377\346\354\353\377\272" \
-  "\312\307\377\242\267\263\377\347\333\343\342\377\3\265\306\302\377\225" \
-  "\255\250\377\352\357\356\377\207\377\377\377\377\5\322\334\332\377\223" \
-  "\254\247\377\311\325\323\377\223\254\247\377\247\273\270\377\265\333" \
-  "\343\342\377\3\320\332\330\377\237\256\253\377k\201|\377\212Slg\377\6" \
-  "n\204\200\377\242\261\256\377\321\333\331\377_vr\377Slg\377\254\271\267" \
-  "\377\260\333\343\342\377\3\262\303\300\377\223\254\247\377\317\332\330" \
-  "\377\204\377\377\377\377\11\367\371\370\377\352\357\356\377\377\377\377" \
-  "\377\347\355\354\377\223\254\247\377\247\273\267\377\377\377\377\377" \
-  "\244\271\265\377\257\301\276\377\347\333\343\342\377\2\234\263\256\377" \
-  "\303\321\316\377\211\377\377\377\377\5\250\274\270\377\267\307\304\377" \
-  "\241\266\262\377\223\254\247\377\321\333\332\377\261\333\343\342\377" \
-  "\4\331\342\341\377\264\301\277\377\200\223\220\377Vni\377\211Slg\377" \
-  "\3^vq\377\220\241\236\377\303\316\314\377\203\333\343\342\377\3_vr\377" \
-  "Slg\377\254\271\267\377\257\333\343\342\377\1\327\340\337\377\202\227" \
-  "\257\252\377\1\370\371\371\377\203\377\377\377\377\12\352\357\356\377" \
-  "\226\256\252\377\223\254\247\377\277\316\313\377\271\311\306\377\223" \
-  "\254\247\377\325\337\335\377\351\356\355\377\223\254\247\377\277\316" \
-  "\313\377\346\333\343\342\377\3\325\336\335\377\223\254\247\377\335\344" \
-  "\343\377\211\377\377\377\377\5\302\320\315\377\241\267\262\377\315\331" \
-  "\326\377\223\254\247\377\263\304\301\377\241\333\343\342\377\6\274\307" \
-  "\306\377\217\241\235\377t\211\205\377|\217\214\377\242\261\256\377\310" \
-  "\322\321\377\210\333\343\342\377\3\311\323\322\377\225\246\243\377by" \
-  "t\377\213Slg\377\2\245\264\261\377\330\341\340\377\205\333\343\342\377" \
-  "\3_vr\377Slg\377\254\271\267\377\257\333\343\342\377\3\314\327\325\377" \
-  "\223\254\247\377\264\305\301\377\204\377\377\377\377\12\307\324\322\377" \
-  "\226\256\252\377\261\303\300\377\230\260\253\377\224\255\250\377\232" \
-  "\261\255\377\367\371\370\377\244\271\265\377\241\266\262\377\331\341" \
-  "\340\377\346\333\343\342\377\3\312\326\324\377\223\254\247\377\353\360" \
-  "\357\377\211\377\377\377\377\5\320\333\331\377\223\254\247\377\361\364" \
-  "\364\377\223\254\247\377\243\270\264\377\237\333\343\342\377\3\327\340" \
-  "\337\377\217\241\235\377Tlg\377\205Slg\377\1\236\255\253\377\204\333" \
-  "\343\342\377\3\326\337\336\377\253\271\266\377v\212\206\377\212Slg\377" \
-  "\2g}y\377\222\243\240\377\202Slg\377\1\305\320\316\377\206\333\343\342" \
-  "\377\3\264\301\277\377\260\275\273\377\314\326\324\377\257\333\343\342" \
-  "\377\3\316\331\330\377\223\254\247\377\263\304\301\377\204\377\377\377" \
-  "\377\11\351\356\355\377\226\256\251\377\223\254\247\377\251\275\271\377" \
-  "\223\254\247\377\272\312\307\377\244\271\265\377\225\255\251\377\316" \
-  "\331\327\377\347\333\343\342\377\3\326\337\336\377\223\254\247\377\332" \
-  "\343\341\377\211\377\377\377\377\5\277\316\313\377\243\270\264\377\363" \
-  "\365\365\377\223\254\247\377\246\272\266\377\237\333\343\342\377\1\217" \
-  "\241\235\377\203Slg\377\2e{w\377czu\377\203Slg\377\5\254\271\267\377" \
-  "\333\343\342\377\300\313\311\377\213\235\232\377[sn\377\211Slg\377\5" \
-  "Yql\377\206\231\225\377\273\307\305\377\333\343\342\377\316\327\326\377" \
-  "\202Slg\377\1\305\320\316\377\270\333\343\342\377\3\321\334\332\377\223" \
-  "\254\247\377\256\301\275\377\205\377\377\377\377\3\366\370\367\377\346" \
-  "\354\352\377\237\265\260\377\202\223\254\247\377\2\240\266\262\377\315" \
-  "\330\327\377\351\333\343\342\377\2\235\264\257\377\275\314\311\377\210" \
-  "\377\377\377\377\6\375\375\375\377\243\271\264\377\271\311\306\377\356" \
-  "\362\361\377\223\254\247\377\251\275\271\377\236\333\343\342\377\5\274" \
-  "\307\306\377Tlg\377Slg\377e{w\377\300\313\311\377\202\333\343\342\377" \
-  "\5\274\307\306\377axt\377Slg\377Vni\377k\201}\377\212Slg\377\3r\207\203" \
-  "\377\246\265\262\377\324\335\334\377\203\333\343\342\377\1\316\327\326" \
-  "\377\202Slg\377\1\305\320\316\377\270\333\343\342\377\3\324\336\334\377" \
-  "\223\254\247\377\251\275\271\377\206\377\377\377\377\5\335\344\343\377" \
-  "\223\254\247\377\233\262\255\377\300\316\314\377\331\341\340\377\352" \
-  "\333\343\342\377\3\272\312\307\377\223\254\247\377\343\351\350\377\207" \
-  "\377\377\377\377\6\310\325\322\377\224\254\250\377\350\355\354\377\351" \
-  "\356\355\377\223\254\247\377\254\277\273\377\236\333\343\342\377\1\217" \
-  "\241\235\377\202Slg\377\1\300\313\311\377\204\333\343\342\377\1\270\305" \
-  "\303\377\212Slg\377\3_wr\377\222\243\240\377\306\320\317\377\206\333" \
-  "\343\342\377\1\316\327\326\377\202Slg\377\1\305\320\316\377\270\333\343" \
-  "\342\377\3\327\340\337\377\223\254\247\377\245\272\266\377\206\377\377" \
-  "\377\377\3\257\301\276\377\223\254\247\377\306\323\320\377\354\333\343" \
-  "\342\377\4\332\342\341\377\244\271\265\377\233\262\255\377\335\345\343" \
-  "\377\204\377\377\377\377\10\375\376\375\377\312\326\324\377\224\254\250" \
-  "\377\307\324\321\377\377\377\377\377\344\352\351\377\223\254\247\377" \
-  "\257\301\276\377\236\333\343\342\377\3t\211\205\377Slg\377g~y\377\206" \
-  "\333\343\342\377\1\\to\377\206Slg\377\4Uni\377}\221\215\377\261\277\274" \
-  "\377\330\341\340\377\210\333\343\342\377\1\316\327\326\377\202Slg\377" \
-  "\1\305\320\316\377\270\333\343\342\377\3\332\342\341\377\223\254\247" \
-  "\377\240\266\262\377\205\377\377\377\377\4\356\361\361\377\223\254\247" \
-  "\377\234\263\257\377\332\342\341\377\355\333\343\342\377\17\324\336\334" \
-  "\377\250\273\270\377\223\254\247\377\261\303\277\377\312\326\324\377" \
-  "\327\340\336\377\304\322\317\377\246\273\267\377\223\254\247\377\304" \
-  "\322\317\377\375\375\375\377\377\377\377\377\340\347\345\377\223\254" \
-  "\247\377\262\303\300\377\236\333\343\342\377\3v\212\206\377Slg\377f|" \
-  "x\377\206\333\343\342\377\1[sn\377\204Slg\377\3i\177{\377\235\255\252" \
-  "\377\317\330\327\377\213\333\343\342\377\1\316\327\326\377\202Slg\377" \
-  "\1\305\320\316\377\271\333\343\342\377\2\225\255\251\377\234\263\256" \
-  "\377\205\377\377\377\377\3\300\317\314\377\223\254\247\377\272\312\307" \
-  "\377\360\333\343\342\377\7\277\316\313\377\245\272\266\377\227\257\252" \
-  "\377\223\254\247\377\225\255\250\377\257\301\276\377\346\353\352\377" \
-  "\203\377\377\377\377\3\333\343\342\377\223\254\247\377\265\306\302\377" \
-  "\236\333\343\342\377\1\220\242\236\377\202Slg\377\1\277\312\310\377\204" \
-  "\333\343\342\377\1\266\302\300\377\205Slg\377\3z\216\212\377\257\274" \
-  "\272\377\330\340\337\377\213\333\343\342\377\1\316\327\326\377\202Sl" \
-  "g\377\1\305\320\316\377\271\333\343\342\377\2\230\260\253\377\230\257" \
-  "\253\377\204\377\377\377\377\4\371\373\372\377\230\260\253\377\225\255" \
-  "\251\377\326\337\336\377\362\333\343\342\377\4\332\342\341\377\266\307" \
-  "\304\377\223\254\247\377\302\320\315\377\204\377\377\377\377\3\326\337" \
-  "\335\377\223\254\247\377\267\310\305\377\236\333\343\342\377\14\276\311" \
-  "\307\377Tmh\377Slg\377d{v\377\274\307\306\377\333\343\342\377\321\332" \
-  "\331\377\235\255\252\377^vq\377Slg\377Vni\377k\201}\377\204Slg\377\3" \
-  "^uq\377\217\241\235\377\304\317\315\377\211\333\343\342\377\1\316\327" \
-  "\326\377\202Slg\377\1\305\320\316\377\271\333\343\342\377\2\233\262\255" \
-  "\377\223\254\247\377\204\377\377\377\377\3\322\334\332\377\223\254\247" \
-  "\377\256\301\275\377\364\333\343\342\377\4\325\336\335\377\225\255\250" \
-  "\377\231\261\254\377\372\373\373\377\203\377\377\377\377\3\321\334\332" \
-  "\377\223\254\247\377\272\312\307\377\237\333\343\342\377\1\223\244\240" \
-  "\377\203Slg\377\2_vr\377Wpk\377\203Slg\377\5\254\271\267\377\333\343" \
-  "\342\377\300\314\312\377\214\236\233\377\\so\377\204Slg\377\3p\205\201" \
-  "\377\245\263\261\377\324\334\333\377\206\333\343\342\377\1\316\327\326" \
-  "\377\202Slg\377\1\305\320\316\377\271\333\343\342\377\3\236\264\260\377" \
-  "\223\254\247\377\373\374\374\377\203\377\377\377\377\3\245\271\265\377" \
-  "\223\254\247\377\315\330\326\377\365\333\343\342\377\3\255\300\274\377" \
-  "\223\254\247\377\324\336\334\377\203\377\377\377\377\3\315\330\326\377" \
-  "\223\254\247\377\275\314\312\377\237\333\343\342\377\3\330\340\337\377" \
-  "\225\246\243\377Umh\377\205Slg\377\1\236\255\253\377\204\333\343\342" \
-  "\377\4\327\337\336\377\254\271\267\377w\214\210\377Tlg\377\203Slg\377" \
-  "\3Xpk\377\205\230\224\377\272\306\304\377\204\333\343\342\377\1\316\327" \
-  "\326\377\202Slg\377\1\305\320\316\377\271\333\343\342\377\3\241\266\262" \
-  "\377\223\254\247\377\366\370\370\377\202\377\377\377\377\3\343\352\350" \
-  "\377\223\254\247\377\243\270\264\377\366\333\343\342\377\3\314\327\325" \
-  "\377\223\254\247\377\246\273\267\377\203\377\377\377\377\3\307\324\322" \
-  "\377\223\254\247\377\300\316\314\377\241\333\343\342\377\6\302\315\313" \
-  "\377\230\250\245\377}\220\215\377\203\226\222\377\246\265\262\377\311" \
-  "\324\322\377\210\333\343\342\377\3\313\325\323\377\227\250\245\377d{" \
-  "v\377\204Slg\377\5f}x\377\233\253\250\377\315\327\325\377\333\343\342" \
-  "\377\316\327\326\377\202Slg\377\1\305\320\316\377\271\333\343\342\377" \
-  "\3\244\271\265\377\223\254\247\377\362\365\364\377\202\377\377\377\377" \
-  "\3\266\307\303\377\223\254\247\377\301\317\315\377\367\333\343\342\377" \
-  "\3\241\267\263\377\223\254\247\377\345\353\352\377\202\377\377\377\377" \
-  "\3\303\321\316\377\223\254\247\377\303\321\317\377\261\333\343\342\377" \
-  "\4\332\342\341\377\267\304\302\377\203\226\222\377Wpk\377\203Slg\377" \
-  "\3Tmh\377|\217\214\377\245\264\261\377\202Slg\377\1\305\320\316\377\206" \
-  "\333\343\342\377\3\317\331\327\377\316\327\326\377\326\337\336\377\260" \
-  "\333\343\342\377\10\247\273\267\377\223\254\247\377\301\317\314\377\333" \
-  "\343\341\377\344\352\351\377\224\255\250\377\231\260\254\377\331\341" \
-  "\340\377\367\333\343\342\377\10\300\316\314\377\223\254\247\377\265\306" \
-  "\303\377\345\353\351\377\322\335\333\377\250\274\270\377\223\254\247" \
-  "\377\306\323\321\377\264\333\343\342\377\3\323\334\332\377\243\262\257" \
-  "\377o\204\200\377\206Slg\377\1\267\304\302\377\206\333\343\342\377\3" \
-  "_vr\377Slg\377\254\271\267\377\260\333\343\342\377\1\252\275\271\377" \
-  "\205\223\254\247\377\1\266\306\303\377\370\333\343\342\377\2\330\341" \
-  "\340\377\230\260\253\377\205\223\254\247\377\1\311\325\323\377\267\333" \
-  "\343\342\377\3\303\316\314\377\217\240\235\377]up\377\204Slg\377\3r\207" \
-  "\203\377\246\265\262\377\324\335\334\377\203\333\343\342\377\3_vr\377" \
-  "Slg\377\254\271\267\377\260\333\343\342\377\7\327\337\336\377\220\243" \
-  "\237\377k\204\177\377u\216\211\377\205\235\230\377\235\263\257\377\323" \
-  "\334\333\377\371\333\343\342\377\7\267\307\304\377\233\261\255\377~\227" \
-  "\222\377q\212\205\377m\206\201\377\273\310\306\377\332\342\341\377\271" \
-  "\333\343\342\377\4\330\340\337\377\256\274\271\377z\216\212\377Tmh\377" \
-  "\203Slg\377\7Yql\377\206\231\225\377\273\307\305\377\333\343\342\377" \
-  "_vr\377Slg\377\254\271\267\377\261\333\343\342\377\1x\214\210\377\202" \
-  "Slg\377\1~\221\216\377\374\333\343\342\377\5\325\335\334\377axt\377S" \
-  "lg\377Tmh\377\251\270\265\377\275\333\343\342\377\3\315\326\325\377\232" \
-  "\252\247\377f}x\377\204Slg\377\4g}y\377Woj\377Slg\377\254\271\267\377" \
-  "\261\333\343\342\377\1}\220\215\377\202Slg\377\1\240\257\254\377\375" \
-  "\333\343\342\377\1f}x\377\202Slg\377\1\222\243\240\377\300\333\343\342" \
-  "\377\3\272\306\304\377\206\230\225\377Xql\377\204Slg\377\1\254\271\267" \
-  "\377\261\333\343\342\377\4\216\237\234\377Slg\377_wr\377\326\336\335" \
-  "\377\375\333\343\342\377\4r\207\203\377Slg\377axt\377\317\330\327\377" \
-  "\302\333\343\342\377\3\324\334\333\377\246\264\262\377q\207\202\377\202" \
-  "Slg\377\1\254\271\267\377\261\333\343\342\377\3\237\257\254\377Slg\377" \
-  "\240\257\254\377\376\333\343\342\377\3\216\240\235\377Wpk\377\246\264" \
-  "\262\377\306\333\343\342\377\3_vr\377Slg\377\254\271\267\377\261\333" \
-  "\343\342\377\3\260\276\273\377axt\377\326\337\336\377\376\333\343\342" \
-  "\377\2\265\302\277\377v\213\207\377\307\333\343\342\377\3_vr\377Slg\377" \
-  "\254\271\267\377\261\333\343\342\377\2\302\315\313\377\242\261\256\377" \
-  "\377\333\343\342\377\311\333\343\342\377\3z\216\212\377p\205\201\377" \
-  "\266\303\301\377\261\333\343\342\377\2\326\336\335\377\327\340\337\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\344\333\343\342\377")
-
-
diff --git a/packages/psplash/files/angstrom/angstrom-psplash-vga-img.h b/packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
deleted file mode 100644
index 5eeef94919..0000000000
--- a/packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
+++ /dev/null
@@ -1,2109 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
-
-#define HAND_IMG_ROWSTRIDE (1428)
-#define HAND_IMG_WIDTH (357)
-#define HAND_IMG_HEIGHT (376)
-#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
-#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\202\333" \
-  "\343\342\377\1\320\331\330\377\202\311\324\322\377\1\324\334\333\377" \
-  "\377\333\343\342\377\251\333\343\342\377\4\323\335\333\377\311\325\323" \
-  "\377\322\334\332\377\332\342\341\377\377\333\343\342\377\266\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342" \
-  "\377\244\333\343\342\377\5\326\337\336\377\273\313\310\377\257\301\276" \
-  "\377\243\270\264\377\227\257\252\377\203\223\254\247\377\5\226\256\251" \
-  "\377\242\267\263\377\256\300\275\377\272\312\307\377\323\335\333\377" \
-  "\377\333\343\342\377\262\333\343\342\377\1\202\225\221\377\202Slg\377" \
-  "\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377\1\315\330" \
-  "\326\377\213\223\254\247\377\1\304\321\317\377\377\333\343\342\377\262" \
-  "\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333" \
-  "\343\342\377\244\333\343\342\377\1\315\330\326\377\202\223\254\247\377" \
-  "\7\241\267\263\377\270\310\305\377\312\326\324\377\330\341\337\377\314" \
-  "\327\325\377\272\312\307\377\244\271\265\377\202\223\254\247\377\1\304" \
-  "\321\317\377\377\333\343\342\377\262\333\343\342\377\1\202\225\221\377" \
-  "\202Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377" \
-  "\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377" \
-  "\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377" \
-  "\333\343\342\377\236\333\343\342\377\4\316\327\326\377\275\311\307\377" \
-  "\266\302\300\377\256\274\271\377\220\254\271\267\377\1q\207\202\377\202" \
-  "Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377\1\315" \
-  "\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377\377\377" \
-  "\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377\333\343" \
-  "\342\377\232\333\343\342\377\4\324\335\334\377\250\266\264\377y\215\211" \
-  "\377]up\377\227Slg\377\1\243\262\257\377\377\333\343\342\377\244\333" \
-  "\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377" \
-  "\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321" \
-  "\317\377\377\333\343\342\377\230\333\343\342\377\3\332\342\341\377\246" \
-  "\265\262\377\\to\377\232Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\244\333\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342" \
-  "\340\377\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1" \
-  "\304\321\317\377\377\333\343\342\377\227\333\343\342\377\2\331\342\341" \
-  "\377\204\227\223\377\234Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\244\333\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342" \
-  "\340\377\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1" \
-  "\304\321\317\377\377\333\343\342\377\227\333\343\342\377\1\216\237\234" \
-  "\377\235Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343\342" \
-  "\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377" \
-  "\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377" \
-  "\377\333\343\342\377\226\333\343\342\377\2\303\316\314\377Tmh\377\235" \
-  "Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377\1\315" \
-  "\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377\377\377" \
-  "\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377\333\343" \
-  "\342\377\226\333\343\342\377\1\211\234\230\377\205Slg\377\7Tmh\377|\217" \
-  "\214\377\252\270\266\377\271\305\303\377\304\317\315\377\320\331\330" \
-  "\377\331\342\341\377\217\333\343\342\377\1\202\225\221\377\202Slg\377" \
-  "\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377\1\315\330" \
-  "\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377\377\377\1" \
-  "\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377\333\343\342" \
-  "\377\226\333\343\342\377\1czu\377\204Slg\377\2~\222\216\377\314\325\324" \
-  "\377\225\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\377\333\343\342\377\244\333\343\342\377\1\315\330\326\377\202\223\254" \
-  "\247\377\1\331\342\340\377\205\377\377\377\377\1\343\352\350\377\202" \
-  "\223\254\247\377\1\304\321\317\377\377\333\343\342\377\225\333\343\342" \
-  "\377\1\322\333\332\377\204Slg\377\2n\203\177\377\326\336\335\377\226" \
-  "\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333" \
-  "\343\342\377\244\333\343\342\377\1\315\330\326\377\202\223\254\247\377" \
-  "\1\331\342\340\377\205\377\377\377\377\1\343\352\350\377\202\223\254" \
-  "\247\377\1\304\321\317\377\377\333\343\342\377\225\333\343\342\377\1" \
-  "\306\321\317\377\204Slg\377\1\277\313\311\377\227\333\343\342\377\1\202" \
-  "\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\244\333" \
-  "\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377" \
-  "\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321" \
-  "\317\377\377\333\343\342\377\225\333\343\342\377\1\304\317\315\377\203" \
-  "Slg\377\2Uni\377\330\340\337\377\227\333\343\342\377\1\244\262\260\377" \
-  "\202\205\230\224\377\1\267\304\302\377\377\333\343\342\377\244\333\343" \
-  "\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205" \
-  "\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317" \
-  "\377\377\333\343\342\377\225\333\343\342\377\1\326\336\335\377\203Sl" \
-  "g\377\1k\201}\377\377\333\343\342\377\300\333\343\342\377\1\315\330\326" \
-  "\377\202\223\254\247\377\1\331\342\340\377\205\377\377\377\377\1\343" \
-  "\352\350\377\202\223\254\247\377\1\304\321\317\377\377\333\343\342\377" \
-  "\226\333\343\342\377\1byt\377\202Slg\377\1q\207\202\377\377\333\343\342" \
-  "\377\300\333\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331" \
-  "\342\340\377\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377" \
-  "\1\304\321\317\377\377\333\343\342\377\226\333\343\342\377\1\204\226" \
-  "\223\377\202Slg\377\1czu\377\377\333\343\342\377\300\333\343\342\377" \
-  "\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377" \
-  "\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377" \
-  "\333\343\342\377\226\333\343\342\377\2\304\317\315\377Tlg\377\202Slg" \
-  "\377\1\305\320\316\377\227\333\343\342\377\1\274\310\306\377\202\254" \
-  "\271\267\377\1\307\322\320\377\377\333\343\342\377\244\333\343\342\377" \
-  "\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377" \
-  "\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377" \
-  "\333\343\342\377\227\333\343\342\377\1\201\224\220\377\202Slg\377\1\206" \
-  "\231\225\377\227\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262" \
-  "\257\377\377\333\343\342\377\244\333\343\342\377\1\315\330\326\377\202" \
-  "\223\254\247\377\1\331\342\340\377\205\377\377\377\377\1\343\352\350" \
-  "\377\202\223\254\247\377\1\304\321\317\377\377\333\343\342\377\227\333" \
-  "\343\342\377\2\323\334\332\377n\204\200\377\202Slg\377\1\247\266\263" \
-  "\377\226\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\377\333\343\342\377\244\333\343\342\377\1\315\330\326\377\202\223\254" \
-  "\247\377\1\331\342\340\377\205\377\377\377\377\1\343\352\350\377\202" \
-  "\223\254\247\377\1\304\321\317\377\377\333\343\342\377\230\333\343\342" \
-  "\377\2\321\333\331\377l\201}\377\202Slg\377\2\220\242\236\377\323\334" \
-  "\333\377\224\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257" \
-  "\377\377\333\343\342\377\244\333\343\342\377\1\315\330\326\377\202\223" \
-  "\254\247\377\1\331\342\340\377\205\377\377\377\377\1\343\352\350\377" \
-  "\202\223\254\247\377\1\304\321\317\377\377\333\343\342\377\231\333\343" \
-  "\342\377\10\324\334\333\377\222\243\240\377Vni\377Slg\377]up\377\217" \
-  "\240\235\377\273\307\305\377\326\336\335\377\221\333\343\342\377\1\202" \
-  "\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\244\333" \
-  "\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377" \
-  "\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321" \
-  "\317\377\377\333\343\342\377\233\333\343\342\377\2\310\322\321\377k\201" \
-  "}\377\204Slg\377\3d{v\377p\206\202\377w\214\210\377\216}\220\215\377" \
-  "\1ayt\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343" \
-  "\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205" \
-  "\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317" \
-  "\377\377\333\343\342\377\231\333\343\342\377\3\327\340\337\377\252\270" \
-  "\266\377p\205\201\377\231Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\244\333\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342" \
-  "\340\377\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1" \
-  "\304\321\317\377\377\333\343\342\377\230\333\343\342\377\2\321\333\331" \
-  "\377p\206\202\377\233Slg\377\1\243\262\257\377\377\333\343\342\377\244" \
-  "\333\343\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340" \
-  "\377\205\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304" \
-  "\321\317\377\377\333\343\342\377\227\333\343\342\377\2\315\327\325\377" \
-  "j\200|\377\234Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343" \
-  "\342\377\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205" \
-  "\377\377\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317" \
-  "\377\377\333\343\342\377\227\333\343\342\377\1|\220\214\377\235Slg\377" \
-  "\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377\1\315\330" \
-  "\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377\377\377\1" \
-  "\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377\333\343\342" \
-  "\377\226\333\343\342\377\1\301\314\312\377\207Slg\377\4Xql\377e|w\377" \
-  "q\206\202\377}\220\215\377\220\205\230\224\377\1d{v\377\202Slg\377\1" \
-  "\243\262\257\377\377\333\343\342\377\244\333\343\342\377\1\315\330\326" \
-  "\377\202\223\254\247\377\1\331\342\340\377\205\377\377\377\377\1\343" \
-  "\352\350\377\202\223\254\247\377\1\304\321\317\377\377\333\343\342\377" \
-  "\226\333\343\342\377\1\200\224\220\377\204Slg\377\4Tlg\377{\217\213\377" \
-  "\263\300\276\377\331\342\341\377\223\333\343\342\377\1\202\225\221\377" \
-  "\202Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343\342\377" \
-  "\1\315\330\326\377\202\223\254\247\377\1\331\342\340\377\205\377\377" \
-  "\377\377\1\343\352\350\377\202\223\254\247\377\1\304\321\317\377\377" \
-  "\333\343\342\377\226\333\343\342\377\1czu\377\204Slg\377\1\256\274\271" \
-  "\377\226\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\377\333\343\342\377\244\333\343\342\377\1\315\330\326\377\202\223\254" \
-  "\247\377\1\331\342\340\377\205\377\377\377\377\1\343\352\350\377\202" \
-  "\223\254\247\377\1\304\321\317\377\377\333\343\342\377\225\333\343\342" \
-  "\377\2\327\340\337\377Tlg\377\203Slg\377\1\223\244\240\377\227\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342" \
-  "\377\244\333\343\342\377\1\315\330\327\377\202\223\254\247\377\1\326" \
-  "\337\335\377\205\377\377\377\377\1\340\347\346\377\202\223\254\247\377" \
-  "\1\304\321\317\377\377\333\343\342\377\225\333\343\342\377\1\306\321" \
-  "\317\377\204Slg\377\1\314\325\324\377\227\333\343\342\377\1\202\225\221" \
-  "\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\244\333\343\342" \
-  "\377\4\327\340\337\377\224\255\250\377\223\254\247\377\274\313\310\377" \
-  "\205\377\377\377\377\1\307\324\321\377\202\223\254\247\377\1\322\334" \
-  "\332\377\377\333\343\342\377\225\333\343\342\377\1\310\323\321\377\203" \
-  "Slg\377\1\\to\377\230\333\343\342\377\1\305\317\316\377\202\270\305\303" \
-  "\377\1\315\326\325\377\377\333\343\342\377\245\333\343\342\377\3\244" \
-  "\271\265\377\223\254\247\377\237\265\261\377\205\377\377\377\377\3\252" \
-  "\275\271\377\223\254\247\377\235\263\257\377\377\333\343\342\377\226" \
-  "\333\343\342\377\2\331\341\340\377Vni\377\202Slg\377\1r\207\203\377\377" \
-  "\333\343\342\377\301\333\343\342\377\1\256\300\275\377\202\223\254\247" \
-  "\377\1\356\361\361\377\203\377\377\377\377\5\370\372\371\377\224\254" \
-  "\250\377\223\254\247\377\250\274\270\377\332\342\341\377\377\333\343" \
-  "\342\377\226\333\343\342\377\1k\201|\377\202Slg\377\1m\202~\377\377\333" \
-  "\343\342\377\275\333\343\342\377\5\332\342\341\377\301\317\315\377\237" \
-  "\265\261\377}\233\225\377v\226\220\377\202\223\254\247\377\1\320\333" \
-  "\331\377\203\377\377\377\377\1\335\344\343\377\202\223\254\247\377\202" \
-  "z\231\223\377\3\233\263\256\377\275\314\311\377\330\341\340\377\377\333" \
-  "\343\342\377\223\333\343\342\377\1\242\261\256\377\202Slg\377\2[sn\377" \
-  "\330\340\337\377\377\333\343\342\377\272\333\343\342\377\3\327\340\337" \
-  "\377\251\275\271\377x\230\221\377\204o\221\212\377\3\220\252\245\377" \
-  "\223\254\247\377\263\305\301\377\203\377\377\377\377\4\300\316\313\377" \
-  "\223\254\247\377\222\253\246\377p\222\213\377\203o\221\212\377\3t\225" \
-  "\216\377\241\267\263\377\324\336\334\377\377\333\343\342\377\221\333" \
-  "\343\342\377\2\327\340\337\377ayt\377\202Slg\377\1\263\300\275\377\227" \
-  "\333\343\342\377\1\233\253\250\377\202x\215\211\377\1\262\277\275\377" \
-  "\377\333\343\342\377\235\333\343\342\377\3\332\342\341\377\261\303\300" \
-  "\377z\232\223\377\206o\221\212\377\4\207\243\235\377\223\254\247\377" \
-  "\230\257\253\377\374\375\375\377\202\377\377\377\377\3\243\270\264\377" \
-  "\223\254\247\377\212\245\240\377\206o\221\212\377\3w\227\220\377\253" \
-  "\277\273\377\330\341\337\377\377\333\343\342\377\220\333\343\342\377" \
-  "\5\265\301\277\377Uni\377Slg\377h\177z\377\327\337\336\377\226\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342" \
-  "\377\234\333\343\342\377\2\307\323\321\377\201\236\230\377\206o\221\212" \
-  "\377\3\205\241\233\377\246\273\267\377\260\302\277\377\202\223\254\247" \
-  "\377\1\244\271\265\377\202\246\273\267\377\202\223\254\247\377\3\254" \
-  "\277\273\377\252\276\272\377\210\244\236\377\206o\221\212\377\2|\233" \
-  "\225\377\300\317\314\377\377\333\343\342\377\220\333\343\342\377\5\255" \
-  "\273\271\377Tlg\377Slg\377y\215\211\377\324\335\334\377\225\333\343\342" \
-  "\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\233\333\343\342\377\2\267\310\305\377s\224\215\377\204o\221\212\377" \
-  "\3y\230\222\377\253\276\273\377\317\331\330\377\202\333\343\342\377\1" \
-  "\321\333\331\377\207\223\254\247\377\1\312\326\324\377\202\333\343\342" \
-  "\377\3\321\333\332\377\257\302\276\377|\233\225\377\204o\221\212\377" \
-  "\2q\222\213\377\260\302\277\377\377\333\343\342\377\220\333\343\342\377" \
-  "\6\261\277\274\377axt\377Slg\377d{v\377\253\271\267\377\331\341\340\377" \
-  "\223\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377" \
-  "\333\343\342\377\231\333\343\342\377\2\332\342\341\377\245\272\266\377" \
-  "\204o\221\212\377\3t\224\216\377\245\272\266\377\326\337\336\377\205" \
-  "\333\343\342\377\1\253\276\273\377\205\247\273\267\377\2\250\274\270" \
-  "\377\331\342\341\377\204\333\343\342\377\3\330\341\337\377\253\277\273" \
-  "\377w\227\220\377\204o\221\212\377\2\234\263\257\377\331\341\340\377" \
-  "\377\333\343\342\377\213\333\343\342\377\1\330\340\337\377\203\322\333" \
-  "\332\377\2\313\325\324\377\205\230\224\377\202Slg\377\6]up\377\207\232" \
-  "\226\377\244\262\260\377\271\306\304\377\306\320\317\377\315\326\325" \
-  "\377\216\322\333\332\377\1\177\223\217\377\202Slg\377\1\243\262\257\377" \
-  "\377\333\343\342\377\231\333\343\342\377\1\231\261\254\377\204o\221\212" \
-  "\377\2\213\246\241\377\321\333\332\377\225\333\343\342\377\2\325\336" \
-  "\335\377\225\255\251\377\204o\221\212\377\2\216\251\243\377\331\342\340" \
-  "\377\377\333\343\342\377\212\333\343\342\377\1\250\267\264\377\236Sl" \
-  "g\377\1\243\262\257\377\377\333\343\342\377\230\333\343\342\377\1\253" \
-  "\276\273\377\204o\221\212\377\2\234\263\256\377\331\341\340\377\230\333" \
-  "\343\342\377\1\246\273\267\377\204o\221\212\377\1\236\264\260\377\377" \
-  "\333\343\342\377\212\333\343\342\377\1\250\267\264\377\236Slg\377\1\243" \
-  "\262\257\377\377\333\343\342\377\227\333\343\342\377\2\275\314\311\377" \
-  "p\221\213\377\202o\221\212\377\2p\222\213\377\256\301\275\377\233\333" \
-  "\343\342\377\2\270\310\305\377r\223\215\377\203o\221\212\377\1\261\303" \
-  "\300\377\377\333\343\342\377\211\333\343\342\377\1\250\267\264\377\236" \
-  "Slg\377\1\243\262\257\377\377\333\343\342\377\226\333\343\342\377\2\312" \
-  "\326\324\377u\226\217\377\203o\221\212\377\1\256\300\275\377\235\333" \
-  "\343\342\377\1\266\307\303\377\203o\221\212\377\2q\222\214\377\302\320" \
-  "\315\377\377\333\343\342\377\210\333\343\342\377\1\250\267\264\377\236" \
-  "Slg\377\1\243\262\257\377\377\333\343\342\377\226\333\343\342\377\1\210" \
-  "\244\236\377\203o\221\212\377\1\232\262\255\377\237\333\343\342\377\1" \
-  "\243\271\265\377\203o\221\212\377\2\177\235\227\377\331\341\340\377\377" \
-  "\333\343\342\377\207\333\343\342\377\1\250\267\264\377\236Slg\377\1\243" \
-  "\262\257\377\377\333\343\342\377\225\333\343\342\377\1\272\312\307\377" \
-  "\203o\221\212\377\2\211\244\237\377\330\341\340\377\237\333\343\342\377" \
-  "\2\332\342\341\377\221\253\245\377\203o\221\212\377\1\256\301\276\377" \
-  "\377\333\343\342\377\207\333\343\342\377\1\250\267\264\377\202Slg\377" \
-  "\1u\211\205\377\230\270\305\303\377\1v\213\207\377\202Slg\377\1\243\262" \
-  "\257\377\377\333\343\342\377\224\333\343\342\377\2\332\342\341\377\201" \
-  "\236\230\377\202o\221\212\377\2p\222\213\377\312\326\324\377\241\333" \
-  "\343\342\377\2\321\333\332\377t\225\216\377\202o\221\212\377\2x\230\221" \
-  "\377\325\337\335\377\377\333\343\342\377\206\333\343\342\377\1\250\267" \
-  "\264\377\202Slg\377\1\200\224\220\377\230\333\343\342\377\1\202\225\221" \
-  "\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\224\333\343\342" \
-  "\377\1\262\304\300\377\203o\221\212\377\1\232\261\255\377\243\333\343" \
-  "\342\377\1\246\272\266\377\203o\221\212\377\1\244\271\265\377\377\333" \
-  "\343\342\377\206\333\343\342\377\1\250\267\264\377\202Slg\377\1\200\224" \
-  "\220\377\230\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257" \
-  "\377\377\333\343\342\377\224\333\343\342\377\1\202\237\231\377\202o\221" \
-  "\212\377\2r\223\215\377\317\332\331\377\243\333\343\342\377\2\326\337" \
-  "\336\377y\230\222\377\202o\221\212\377\2x\230\221\377\332\342\341\377" \
-  "\377\333\343\342\377\205\333\343\342\377\1\250\267\264\377\202Slg\377" \
-  "\1\200\224\220\377\230\333\343\342\377\1\202\225\221\377\202Slg\377\1" \
-  "\243\262\257\377\377\333\343\342\377\223\333\343\342\377\1\315\330\326" \
-  "\377\203o\221\212\377\1\236\264\260\377\245\333\343\342\377\1\253\276" \
-  "\273\377\203o\221\212\377\1\302\320\315\377\377\333\343\342\377\205\333" \
-  "\343\342\377\1\250\267\264\377\202Slg\377\1\200\224\220\377\230\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342" \
-  "\377\223\333\343\342\377\1\253\277\273\377\203o\221\212\377\1\302\320" \
-  "\315\377\245\333\343\342\377\1\317\331\330\377\203o\221\212\377\1\237" \
-  "\265\261\377\377\333\343\342\377\205\333\343\342\377\1\311\324\322\377" \
-  "\202\254\271\267\377\1\274\307\306\377\230\333\343\342\377\1\325\336" \
-  "\335\377\202\322\333\332\377\1\327\340\337\377\377\333\343\342\377\223" \
-  "\333\343\342\377\1\212\246\240\377\202o\221\212\377\2w\227\221\377\332" \
-  "\342\341\377\246\333\343\342\377\1\205\241\233\377\202o\221\212\377\1" \
-  "}\234\226\377\377\333\343\342\377\377\333\343\342\377\267\333\343\342" \
-  "\377\2\325\336\335\377p\222\213\377\202o\221\212\377\1\230\260\253\377" \
-  "\247\333\343\342\377\1\246\273\267\377\203o\221\212\377\1\313\327\325" \
-  "\377\377\333\343\342\377\377\333\343\342\377\266\333\343\342\377\1\310" \
-  "\324\322\377\203o\221\212\377\1\264\305\302\377\247\333\343\342\377\1" \
-  "\275\314\311\377\203o\221\212\377\1\275\314\312\377\377\333\343\342\377" \
-  "\377\333\343\342\377\266\333\343\342\377\1\275\314\312\377\203o\221\212" \
-  "\377\1\277\316\313\377\247\333\343\342\377\1\310\325\323\377\203o\221" \
-  "\212\377\1\262\304\300\377\377\333\343\342\377\377\333\343\342\377\266" \
-  "\333\343\342\377\1\263\305\301\377\203o\221\212\377\1\312\326\324\377" \
-  "\247\333\343\342\377\1\323\335\334\377\203o\221\212\377\1\247\273\267" \
-  "\377\377\333\343\342\377\217\333\343\342\377\4\330\340\337\377\300\313" \
-  "\311\377\262\277\275\377\247\266\263\377\202\234\254\251\377\4\247\265" \
-  "\263\377\262\277\275\377\277\313\311\377\330\340\337\377\377\333\343" \
-  "\342\377\235\333\343\342\377\1\251\275\271\377\203o\221\212\377\1\325" \
-  "\336\335\377\250\333\343\342\377\1r\223\215\377\202o\221\212\377\1\233" \
-  "\263\256\377\377\333\343\342\377\214\333\343\342\377\4\316\330\326\377" \
-  "\231\251\246\377v\213\207\377Xpk\377\210Slg\377\4Xpk\377v\212\206\377" \
-  "\230\251\246\377\316\327\326\377\377\333\343\342\377\232\333\343\342" \
-  "\377\1\242\267\263\377\203o\221\212\377\1\332\342\341\377\250\333\343" \
-  "\342\377\1y\231\222\377\202o\221\212\377\1\225\256\251\377\377\333\343" \
-  "\342\377\212\333\343\342\377\3\310\323\321\377\210\233\227\377Voj\377" \
-  "\216Slg\377\3Voj\377\210\232\227\377\307\322\320\377\377\333\343\342" \
-  "\377\230\333\343\342\377\1\253\276\273\377\203o\221\212\377\1\322\334" \
-  "\333\377\247\333\343\342\377\2\332\342\341\377p\222\213\377\202o\221" \
-  "\212\377\1\236\265\260\377\377\333\343\342\377\211\333\343\342\377\2" \
-  "\251\270\265\377Xql\377\222Slg\377\2Xpk\377\246\265\262\377\377\333\343" \
-  "\342\377\227\333\343\342\377\1\266\307\303\377\203o\221\212\377\1\307" \
-  "\324\322\377\247\333\343\342\377\1\320\333\331\377\203o\221\212\377\1" \
-  "\251\275\271\377\377\333\343\342\377\207\333\343\342\377\2\331\342\341" \
-  "\377\210\233\227\377\226Slg\377\2\204\227\223\377\330\341\340\377\377" \
-  "\333\343\342\377\225\333\343\342\377\1\300\317\314\377\203o\221\212\377" \
-  "\1\274\314\311\377\247\333\343\342\377\1\305\322\320\377\203o\221\212" \
-  "\377\1\265\306\303\377\377\333\343\342\377\207\333\343\342\377\1\213" \
-  "\235\231\377\230Slg\377\1\206\231\225\377\377\333\343\342\377\225\333" \
-  "\343\342\377\1\313\327\325\377\203o\221\212\377\1\256\301\276\377\247" \
-  "\333\343\342\377\1\271\311\307\377\203o\221\212\377\1\300\317\314\377" \
-  "\366\333\343\342\377\5\322\333\332\377\240\260\255\377\220\241\236\377" \
-  "\246\265\262\377\330\340\337\377\212\333\343\342\377\1\231\251\246\377" \
-  "\211Slg\377\3[sn\377g}y\377l\202~\377\202q\207\202\377\3l\202~\377g}" \
-  "y\377[sn\377\211Slg\377\1\227\247\244\377\377\333\343\342\377\224\333" \
-  "\343\342\377\2\330\341\337\377t\225\216\377\202o\221\212\377\1\220\252" \
-  "\245\377\247\333\343\342\377\1\235\264\257\377\203o\221\212\377\1\320" \
-  "\333\331\377\365\333\343\342\377\2\310\323\321\377ayt\377\203Slg\377" \
-  "\2m\203\177\377\326\336\335\377\210\333\343\342\377\2\306\321\317\377" \
-  "Umh\377\205Slg\377\4o\204\200\377\230\250\245\377\272\306\304\377\317" \
-  "\330\327\377\210\333\343\342\377\4\317\330\327\377\272\306\304\377\227" \
-  "\250\245\377o\204\200\377\205Slg\377\2Tmh\377\305\317\316\377\377\333" \
-  "\343\342\377\224\333\343\342\377\1\223\254\247\377\202o\221\212\377\2" \
-  "s\224\215\377\327\340\337\377\246\333\343\342\377\1|\232\224\377\202" \
-  "o\221\212\377\1\206\242\234\377\366\333\343\342\377\1y\215\211\377\205" \
-  "Slg\377\1\233\253\250\377\210\333\343\342\377\1~\222\216\377\204Slg\377" \
-  "\2{\217\213\377\301\314\312\377\220\333\343\342\377\2\303\316\314\377" \
-  "~\222\216\377\204Slg\377\1}\220\215\377\377\333\343\342\377\224\333\343" \
-  "\342\377\1\264\305\302\377\203o\221\212\377\1\273\312\310\377\245\333" \
-  "\343\342\377\1\306\323\321\377\203o\221\212\377\1\250\274\270\377\365" \
-  "\333\343\342\377\2\331\341\340\377Voj\377\205Slg\377\1\177\222\217\377" \
-  "\207\333\343\342\377\1\305\317\316\377\203Slg\377\2Voj\377\247\266\263" \
-  "\377\224\333\343\342\377\2\253\271\267\377Woj\377\203Slg\377\1\303\316" \
-  "\314\377\377\333\343\342\377\223\333\343\342\377\2\323\335\334\377p\222" \
-  "\213\377\202o\221\212\377\1\225\255\251\377\245\333\343\342\377\1\237" \
-  "\265\261\377\203o\221\212\377\1\312\326\324\377\366\333\343\342\377\1" \
-  "axt\377\205Slg\377\1\210\233\227\377\207\333\343\342\377\1\235\254\252" \
-  "\377\203Slg\377\1\260\276\273\377\226\333\343\342\377\1\263\300\276\377" \
-  "\203Slg\377\1\231\251\246\377\377\333\343\342\377\224\333\343\342\377" \
-  "\1\213\246\241\377\203o\221\212\377\1\307\323\321\377\243\333\343\342" \
-  "\377\2\316\331\327\377r\223\214\377\202o\221\212\377\1\200\236\230\377" \
-  "\367\333\343\342\377\1\232\252\247\377\205Slg\377\1\271\306\304\377\207" \
-  "\333\343\342\377\1v\213\207\377\202Slg\377\1\204\227\223\377\230\333" \
-  "\343\342\377\1\212\234\231\377\202Slg\377\1q\206\202\377\377\333\343" \
-  "\342\377\224\333\343\342\377\1\300\316\314\377\203o\221\212\377\1\215" \
-  "\247\242\377\207\333\343\342\377\4\327\337\336\377\236\264\260\377\270" \
-  "\310\305\377\324\336\334\377\215\333\343\342\377\4\326\337\336\377\273" \
-  "\312\310\377\236\264\260\377\322\334\332\377\207\333\343\342\377\1\227" \
-  "\257\252\377\203o\221\212\377\1\263\305\301\377\367\333\343\342\377\6" \
-  "\331\341\340\377\225\245\242\377Voj\377Slg\377^uq\377\251\267\265\377" \
-  "\210\333\343\342\377\1Xql\377\202Slg\377\1\301\314\312\377\230\333\343" \
-  "\342\377\1\305\317\316\377\202Slg\377\2Tmh\377\331\341\340\377\377\333" \
-  "\343\342\377\224\333\343\342\377\1\215\250\243\377\203o\221\212\377\1" \
-  "\276\315\312\377\206\333\343\342\377\1\274\313\311\377\202\223\254\247" \
-  "\377\3\224\255\250\377\254\277\274\377\313\326\325\377\211\333\343\342" \
-  "\377\3\316\331\327\377\257\302\276\377\226\256\251\377\202\223\254\247" \
-  "\377\1\265\306\303\377\206\333\343\342\377\1\307\324\322\377\203o\221" \
-  "\212\377\2\202\237\231\377\332\342\341\377\371\333\343\342\377\2\330" \
-  "\340\337\377\315\326\325\377\211\333\343\342\377\1\325\335\334\377\202" \
-  "Slg\377\1e|w\377\232\333\343\342\377\1g~y\377\202Slg\377\1\316\330\326" \
-  "\377\377\333\343\342\377\224\333\343\342\377\1\306\323\321\377\203o\221" \
-  "\212\377\2z\232\223\377\321\333\332\377\205\333\343\342\377\1\236\264" \
-  "\260\377\205\223\254\247\377\3\241\267\262\377\277\316\313\377\330\341" \
-  "\340\377\203\333\343\342\377\3\331\341\340\377\302\320\315\377\244\271" \
-  "\265\377\205\223\254\247\377\2\231\260\254\377\331\341\340\377\204\333" \
-  "\343\342\377\2\325\336\335\377\200\236\230\377\203o\221\212\377\1\274" \
-  "\313\311\377\377\333\343\342\377\206\333\343\342\377\1\311\323\322\377" \
-  "\202Slg\377\1w\213\207\377\232\333\343\342\377\1y\215\211\377\202Slg" \
-  "\377\1\303\316\314\377\377\333\343\342\377\225\333\343\342\377\1\226" \
-  "\256\252\377\203o\221\212\377\2\207\243\236\377\330\341\337\377\203\333" \
-  "\343\342\377\1\310\324\322\377\202\223\254\247\377\2\271\311\306\377" \
-  "\262\304\300\377\204\223\254\247\377\5\230\260\253\377\275\314\312\377" \
-  "\333\343\342\377\304\321\317\377\232\261\254\377\204\223\254\247\377" \
-  "\2\255\300\274\377\276\315\312\377\202\223\254\247\377\1\301\317\314" \
-  "\377\203\333\343\342\377\2\332\342\341\377\216\250\243\377\203o\221\212" \
-  "\377\1\213\246\241\377\377\333\343\342\377\207\333\343\342\377\1\301" \
-  "\314\312\377\202Slg\377\1\200\224\220\377\232\333\343\342\377\1\203\226" \
-  "\222\377\202Slg\377\1\273\307\305\377\377\333\343\342\377\225\333\343" \
-  "\342\377\2\325\337\335\377\201\237\231\377\203o\221\212\377\1\230\260" \
-  "\253\377\203\333\343\342\377\10\251\275\271\377\223\254\247\377\225\255" \
-  "\251\377\365\367\367\377\377\377\377\377\360\363\362\377\302\320\315" \
-  "\377\231\261\254\377\202\223\254\247\377\3\236\264\260\377\333\343\342" \
-  "\377\247\273\267\377\202\223\254\247\377\10\227\257\252\377\275\314\311" \
-  "\377\353\360\357\377\377\377\377\377\373\374\373\377\232\261\254\377" \
-  "\223\254\247\377\242\270\263\377\203\333\343\342\377\1\240\266\262\377" \
-  "\203o\221\212\377\2z\231\222\377\317\332\331\377\377\333\343\342\377" \
-  "\207\333\343\342\377\1\313\325\324\377\202Slg\377\1t\211\205\377\232" \
-  "\333\343\342\377\1v\213\207\377\202Slg\377\1\305\317\316\377\377\333" \
-  "\343\342\377\226\333\343\342\377\2\315\330\326\377w\227\220\377\203o" \
-  "\221\212\377\3\223\254\250\377\327\340\336\377\322\334\333\377\202\223" \
-  "\254\247\377\1\271\311\306\377\204\377\377\377\377\2\372\373\373\377" \
-  "\271\311\306\377\202\223\254\247\377\5\323\335\333\377\226\256\251\377" \
-  "\223\254\247\377\257\301\276\377\367\371\371\377\204\377\377\377\377" \
-  "\1\303\321\316\377\202\223\254\247\377\3\314\330\326\377\331\342\340" \
-  "\377\235\264\257\377\203o\221\212\377\2r\223\214\377\304\321\317\377" \
-  "\374\333\343\342\377\3\303\316\314\377\263\300\276\377\313\325\324\377" \
-  "\210\333\343\342\377\1\327\337\336\377\202Slg\377\2`ws\377\332\342\341" \
-  "\377\231\333\343\342\377\1ayt\377\202Slg\377\1\321\332\331\377\377\333" \
-  "\343\342\377\227\333\343\342\377\2\277\316\313\377p\222\213\377\203o" \
-  "\221\212\377\2\205\241\233\377\257\301\276\377\202\223\254\247\377\1" \
-  "\346\354\353\377\205\377\377\377\377\1\315\330\326\377\202\223\253\246" \
-  "\377\4\225\255\250\377\222\253\246\377\223\254\247\377\300\316\313\377" \
-  "\205\377\377\377\377\1\360\363\362\377\202\223\254\247\377\2\253\277" \
-  "\273\377\215\250\242\377\204o\221\212\377\1\264\305\302\377\373\333\343" \
-  "\342\377\2\325\336\335\377}\221\215\377\202Slg\377\2Tlg\377\220\242\236" \
-  "\377\210\333\343\342\377\1\\to\377\202Slg\377\1\267\304\302\377\230\333" \
-  "\343\342\377\1\274\307\306\377\202Slg\377\2Wpk\377\332\342\341\377\377" \
-  "\333\343\342\377\230\333\343\342\377\2\261\303\300\377p\222\213\377\203" \
-  "o\221\212\377\3\220\252\245\377\223\254\247\377\247\273\267\377\204\377" \
-  "\377\377\377\3\372\373\373\377\300\317\314\377\222\253\246\377\206\223" \
-  "\254\247\377\2\271\311\306\377\367\371\371\377\204\377\377\377\377\4" \
-  "\261\303\300\377\223\254\247\377\222\253\246\377q\222\214\377\203o\221" \
-  "\212\377\1\247\274\270\377\374\333\343\342\377\1\213\235\232\377\205" \
-  "Slg\377\1\254\271\267\377\207\333\343\342\377\1~\221\216\377\202Slg\377" \
-  "\2v\212\206\377\332\342\341\377\227\333\343\342\377\1y\216\212\377\202" \
-  "Slg\377\1z\216\212\377\377\333\343\342\377\232\333\343\342\377\4\276" \
-  "\315\312\377v\226\220\377o\221\212\377{\232\224\377\202\223\254\247\377" \
-  "\1\325\337\335\377\203\377\377\377\377\15\376\376\376\377\255\300\274" \
-  "\377\223\254\247\377\230\260\253\377\315\331\326\377\353\360\357\377" \
-  "\374\375\375\377\356\362\361\377\323\335\333\377\234\263\256\377\223" \
-  "\254\247\377\245\272\265\377\374\374\374\377\203\377\377\377\377\1\337" \
-  "\346\345\377\202\223\254\247\377\4\177\235\227\377o\221\212\377s\224" \
-  "\215\377\267\307\305\377\374\333\343\342\377\2\332\342\341\377\\so\377" \
-  "\205Slg\377\1\204\227\223\377\207\333\343\342\377\1\244\263\260\377\203" \
-  "Slg\377\1\234\253\251\377\226\333\343\342\377\1\233\253\250\377\203S" \
-  "lg\377\1\242\261\256\377\377\333\343\342\377\233\333\343\342\377\6\313" \
-  "\327\325\377\200\236\230\377\213\246\240\377\223\254\247\377\232\261" \
-  "\255\377\373\374\373\377\203\377\377\377\377\4\320\333\330\377\223\254" \
-  "\247\377\244\271\264\377\361\364\364\377\205\377\377\377\377\4\366\370" \
-  "\370\377\254\277\273\377\223\254\247\377\304\321\317\377\203\377\377" \
-  "\377\377\6\376\376\376\377\241\267\262\377\223\254\247\377\216\250\243" \
-  "\377{\232\224\377\306\323\321\377\375\333\343\342\377\2\331\342\341\377" \
-  "Yrm\377\205Slg\377\1\201\225\221\377\207\333\343\342\377\2\314\326\324" \
-  "\377Uni\377\203Slg\377\2\221\242\237\377\331\341\340\377\222\333\343" \
-  "\342\377\2\331\341\340\377\220\242\236\377\203Slg\377\2Uni\377\314\325" \
-  "\324\377\377\333\343\342\377\234\333\343\342\377\1\307\324\322\377\202" \
-  "\223\254\247\377\1\303\321\316\377\203\377\377\377\377\4\367\371\371" \
-  "\377\227\257\252\377\225\255\250\377\351\356\355\377\207\377\377\377" \
-  "\377\4\361\365\364\377\230\260\253\377\224\255\250\377\357\363\362\377" \
-  "\203\377\377\377\377\1\315\331\326\377\202\223\254\247\377\1\276\315" \
-  "\313\377\377\333\343\342\377\1\204\226\223\377\205Slg\377\1\245\264\261" \
-  "\377\210\333\343\342\377\1\214\236\233\377\204Slg\377\3g}y\377\251\267" \
-  "\265\377\327\337\336\377\216\333\343\342\377\3\325\336\335\377\246\265" \
-  "\262\377e|w\377\204Slg\377\1\215\236\233\377\377\333\343\342\377\235" \
-  "\333\343\342\377\1\256\300\275\377\202\223\254\247\377\1\360\363\363" \
-  "\377\203\377\377\377\377\3\341\350\346\377\223\254\247\377\266\307\304" \
-  "\377\211\377\377\377\377\3\300\317\314\377\223\254\247\377\326\340\336" \
-  "\377\203\377\377\377\377\4\367\371\370\377\226\256\252\377\223\254\247" \
-  "\377\247\273\267\377\377\333\343\342\377\2\320\332\330\377q\207\202\377" \
-  "\203Slg\377\2\204\226\223\377\332\342\341\377\210\333\343\342\377\2\317" \
-  "\331\327\377Yrm\377\205Slg\377\7Yql\377~\222\216\377\240\260\255\377" \
-  "\265\302\300\377\312\324\323\377\326\336\335\377\332\342\341\377\202" \
-  "\333\343\342\377\7\332\342\341\377\326\336\335\377\312\324\323\377\265" \
-  "\302\300\377\240\260\255\377}\220\215\377Wpk\377\205Slg\377\2Yrm\377" \
-  "\317\331\327\377\377\333\343\342\377\234\333\343\342\377\4\325\336\335" \
-  "\377\225\255\250\377\223\254\247\377\262\304\300\377\204\377\377\377" \
-  "\377\3\312\326\324\377\223\254\247\377\315\331\327\377\211\377\377\377" \
-  "\377\3\330\341\337\377\223\254\247\377\300\317\314\377\204\377\377\377" \
-  "\377\1\274\313\310\377\202\223\254\247\377\1\320\333\331\377\377\333" \
-  "\343\342\377\4\331\342\341\377\272\306\304\377\251\270\265\377\300\313" \
-  "\311\377\213\333\343\342\377\1\255\273\271\377\214Slg\377\202Xpk\377" \
-  "\214Slg\377\1\256\273\271\377\377\333\343\342\377\235\333\343\342\377" \
-  "\1\271\311\306\377\202\223\254\247\377\1\340\347\345\377\204\377\377" \
-  "\377\377\3\302\320\316\377\223\254\247\377\325\337\335\377\211\377\377" \
-  "\377\377\3\340\347\345\377\223\254\247\377\270\311\305\377\204\377\377" \
-  "\377\377\1\352\357\356\377\202\223\254\247\377\1\263\304\301\377\377" \
-  "\333\343\342\377\220\333\343\342\377\1\237\256\253\377\230Slg\377\1\236" \
-  "\255\253\377\377\333\343\342\377\235\333\343\342\377\5\332\342\341\377" \
-  "\234\263\256\377\223\254\247\377\241\267\263\377\376\376\376\377\204" \
-  "\377\377\377\377\3\330\341\337\377\223\254\247\377\277\316\313\377\211" \
-  "\377\377\377\377\3\311\326\323\377\223\254\247\377\316\331\327\377\205" \
-  "\377\377\377\377\4\253\276\272\377\223\254\247\377\227\257\252\377\330" \
-  "\340\337\377\377\333\343\342\377\220\333\343\342\377\2\236\256\253\377" \
-  "Uni\377\224Slg\377\2Uni\377\236\255\253\377\377\333\343\342\377\236\333" \
-  "\343\342\377\1\305\322\320\377\202\223\254\247\377\1\316\331\327\377" \
-  "\205\377\377\377\377\4\356\362\362\377\223\254\247\377\237\265\261\377" \
-  "\371\373\373\377\207\377\377\377\377\4\375\376\376\377\246\273\267\377" \
-  "\223\254\247\377\344\352\351\377\205\377\377\377\377\1\330\341\337\377" \
-  "\202\223\254\247\377\1\276\315\312\377\377\333\343\342\377\221\333\343" \
-  "\342\377\2\276\312\310\377e{w\377\222Slg\377\2dzv\377\275\311\307\377" \
-  "\377\333\343\342\377\237\333\343\342\377\4\247\273\267\377\223\254\247" \
-  "\377\226\256\252\377\367\371\371\377\206\377\377\377\377\3\264\306\302" \
-  "\377\223\254\247\377\274\314\310\377\207\377\377\377\377\4\310\325\322" \
-  "\377\223\254\247\377\251\275\271\377\376\376\376\377\205\377\377\377" \
-  "\377\4\374\375\374\377\234\263\256\377\223\254\247\377\240\266\262\377" \
-  "\377\333\343\342\377\222\333\343\342\377\3\326\336\335\377\242\261\256" \
-  "\377e|w\377\216Slg\377\3d{v\377\241\261\256\377\325\336\335\377\377\333" \
-  "\343\342\377\237\333\343\342\377\1\320\333\331\377\202\223\254\247\377" \
-  "\1\274\314\311\377\207\377\377\377\377\5\365\367\367\377\233\262\255" \
-  "\377\223\254\247\377\262\304\301\377\364\367\366\377\203\377\377\377" \
-  "\377\5\370\372\371\377\273\313\310\377\223\254\247\377\226\257\252\377" \
-  "\356\362\361\377\207\377\377\377\377\1\307\324\321\377\202\223\254\247" \
-  "\377\1\312\326\324\377\377\333\343\342\377\223\333\343\342\377\5\331" \
-  "\341\340\377\263\300\275\377\220\241\236\377o\204\200\377Umh\377\206" \
-  "Slg\377\5Umh\377n\204\200\377\217\241\235\377\262\277\275\377\331\341" \
-  "\340\377\377\333\343\342\377\241\333\343\342\377\1\262\304\301\377\202" \
-  "\223\254\247\377\1\352\357\356\377\210\377\377\377\377\13\345\353\352" \
-  "\377\240\266\261\377\223\254\247\377\225\255\250\377\247\274\270\377" \
-  "\271\311\306\377\252\276\272\377\226\257\252\377\223\254\247\377\234" \
-  "\263\256\377\336\346\344\377\210\377\377\377\377\4\363\365\365\377\224" \
-  "\254\250\377\223\254\247\377\254\277\273\377\377\333\343\342\377\227" \
-  "\333\343\342\377\3\327\340\337\377\315\326\325\377\303\316\314\377\202" \
-  "\271\306\304\377\3\303\316\314\377\315\326\325\377\327\340\337\377\377" \
-  "\333\343\342\377\244\333\343\342\377\4\330\340\337\377\227\257\252\377" \
-  "\223\254\247\377\253\276\273\377\212\377\377\377\377\3\371\372\372\377" \
-  "\232\262\255\377\223\253\246\377\203\223\254\247\377\3\222\253\246\377" \
-  "\226\256\252\377\364\366\365\377\212\377\377\377\377\4\265\306\303\377" \
-  "\223\254\247\377\224\255\250\377\324\335\334\377\377\333\343\342\377" \
-  "\377\333\343\342\377\302\333\343\342\377\1\276\315\312\377\202\223\254" \
-  "\247\377\1\331\342\340\377\212\377\377\377\377\1\346\353\352\377\202" \
-  "\223\254\247\377\6\260\302\276\377\305\322\320\377\266\307\304\377\223" \
-  "\253\247\377\223\254\247\377\333\343\342\377\212\377\377\377\377\1\343" \
-  "\351\350\377\202\223\254\247\377\1\267\310\305\377\377\333\343\342\377" \
-  "\377\333\343\342\377\302\333\343\342\377\4\237\265\261\377\223\254\247" \
-  "\377\234\263\256\377\374\375\374\377\212\377\377\377\377\1\270\310\305" \
-  "\377\202\223\254\247\377\6\322\334\333\377\333\343\342\377\327\340\337" \
-  "\377\227\257\252\377\223\254\247\377\256\300\275\377\213\377\377\377" \
-  "\377\4\244\271\265\377\223\254\247\377\232\261\255\377\331\342\341\377" \
-  "\377\333\343\342\377\211\333\343\342\377\1\235\255\252\377\207czu\377" \
-  "\1\274\310\306\377\377\333\343\342\377\256\333\343\342\377\1\312\326" \
-  "\324\377\202\223\254\247\377\1\307\324\321\377\212\377\377\377\377\4" \
-  "\364\367\366\377\225\255\250\377\223\254\247\377\251\275\271\377\203" \
-  "\333\343\342\377\1\262\303\300\377\202\223\254\247\377\1\354\361\360" \
-  "\377\212\377\377\377\377\1\321\334\332\377\202\223\254\247\377\1\303" \
-  "\320\316\377\377\333\343\342\377\211\333\343\342\377\1|\217\214\377\207" \
-  "Slg\377\1\270\304\302\377\377\333\343\342\377\256\333\343\342\377\4\253" \
-  "\276\273\377\223\254\247\377\224\255\250\377\363\366\365\377\212\377" \
-  "\377\377\377\1\312\326\323\377\202\223\254\247\377\1\307\324\322\377" \
-  "\203\333\343\342\377\1\320\332\331\377\202\223\254\247\377\1\277\316" \
-  "\313\377\212\377\377\377\377\4\371\372\372\377\230\260\253\377\223\254" \
-  "\247\377\244\271\265\377\377\333\343\342\377\211\333\343\342\377\1ax" \
-  "t\377\207Slg\377\1\270\304\302\377\377\333\343\342\377\255\333\343\342" \
-  "\377\4\324\335\334\377\224\255\250\377\223\254\247\377\266\307\303\377" \
-  "\212\377\377\377\377\5\375\375\375\377\236\264\260\377\223\254\247\377" \
-  "\236\264\260\377\332\342\341\377\204\333\343\342\377\4\246\273\267\377" \
-  "\223\254\247\377\230\257\253\377\371\372\372\377\212\377\377\377\377" \
-  "\1\300\316\313\377\202\223\254\247\377\1\316\331\330\377\377\333\343" \
-  "\342\377\207\333\343\342\377\1\325\335\334\377\205Slg\377\4Yql\377\216" \
-  "\237\234\377\251\270\265\377\323\334\332\377\377\333\343\342\377\255" \
-  "\333\343\342\377\1\267\307\304\377\202\223\254\247\377\1\343\352\350" \
-  "\377\212\377\377\377\377\1\333\343\342\377\202\223\254\247\377\1\274" \
-  "\313\310\377\205\333\343\342\377\1\305\322\320\377\202\223\254\247\377" \
-  "\1\320\333\331\377\212\377\377\377\377\1\355\361\360\377\202\223\254" \
-  "\247\377\1\260\302\277\377\377\333\343\342\377\207\333\343\342\377\1" \
-  "\313\325\324\377\204Slg\377\2i\200{\377\313\325\324\377\377\333\343\342" \
-  "\377\257\333\343\342\377\4\331\342\341\377\232\261\255\377\223\254\247" \
-  "\377\245\271\265\377\213\377\377\377\377\4\256\300\275\377\223\254\247" \
-  "\377\226\256\251\377\327\337\336\377\205\333\343\342\377\4\332\342\341" \
-  "\377\234\262\256\377\223\254\247\377\243\271\264\377\213\377\377\377" \
-  "\377\4\256\301\275\377\223\254\247\377\226\256\251\377\327\337\336\377" \
-  "\377\333\343\342\377\206\333\343\342\377\1\302\315\313\377\204Slg\377" \
-  "\1\273\307\305\377\377\333\343\342\377\260\333\343\342\377\1\303\320" \
-  "\316\377\202\223\254\247\377\1\322\334\332\377\212\377\377\377\377\1" \
-  "\354\361\360\377\202\223\254\247\377\1\260\302\277\377\207\333\343\342" \
-  "\377\1\271\311\306\377\202\223\254\247\377\1\342\350\347\377\212\377" \
-  "\377\377\377\1\334\344\342\377\202\223\254\247\377\1\274\313\310\377" \
-  "\377\333\343\342\377\206\333\343\342\377\1\307\322\320\377\203Slg\377" \
-  "\1^uq\377\377\333\343\342\377\261\333\343\342\377\4\244\271\265\377\223" \
-  "\254\247\377\230\260\253\377\371\373\372\377\212\377\377\377\377\1\277" \
-  "\316\313\377\202\223\254\247\377\1\316\331\327\377\207\333\343\342\377" \
-  "\4\325\336\335\377\225\255\250\377\223\254\247\377\264\306\302\377\212" \
-  "\377\377\377\377\5\375\376\375\377\237\265\261\377\223\254\247\377\236" \
-  "\264\260\377\332\342\341\377\377\333\343\342\377\205\333\343\342\377" \
-  "\1\326\337\336\377\203Slg\377\1q\207\202\377\377\333\343\342\377\260" \
-  "\333\343\342\377\1\316\331\327\377\202\223\254\247\377\1\300\317\314" \
-  "\377\212\377\377\377\377\4\371\372\372\377\230\257\253\377\223\254\247" \
-  "\377\244\271\265\377\211\333\343\342\377\4\255\300\274\377\223\254\247" \
-  "\377\224\254\250\377\362\365\364\377\212\377\377\377\377\1\312\326\324" \
-  "\377\202\223\254\247\377\1\307\324\322\377\377\333\343\342\377\206\333" \
-  "\343\342\377\1^vq\377\202Slg\377\1o\205\201\377\377\333\343\342\377\260" \
-  "\333\343\342\377\1\260\302\277\377\202\223\254\247\377\1\356\361\361" \
-  "\377\212\377\377\377\377\1\320\333\331\377\202\223\254\247\377\1\303" \
-  "\320\316\377\211\333\343\342\377\1\314\327\325\377\202\223\254\247\377" \
-  "\1\306\323\320\377\212\377\377\377\377\4\365\367\367\377\225\255\251" \
-  "\377\223\254\247\377\251\275\271\377\377\333\343\342\377\206\333\343" \
-  "\342\377\1}\221\215\377\202Slg\377\1byt\377\230\333\343\342\377\1\305" \
-  "\317\316\377\202\270\305\303\377\1\315\326\325\377\377\333\343\342\377" \
-  "\223\333\343\342\377\4\326\337\336\377\226\256\251\377\223\254\247\377" \
-  "\257\301\276\377\213\377\377\377\377\4\243\271\264\377\223\254\247\377" \
-  "\232\261\255\377\331\342\341\377\212\333\343\342\377\4\242\267\263\377" \
-  "\223\254\247\377\233\262\256\377\374\374\374\377\212\377\377\377\377" \
-  "\1\271\311\306\377\202\223\254\247\377\1\322\334\333\377\377\333\343" \
-  "\342\377\205\333\343\342\377\1\270\304\302\377\203Slg\377\1\305\320\316" \
-  "\377\227\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\377\333\343\342\377\223\333\343\342\377\1\273\313\310\377\202\223\254" \
-  "\247\377\1\334\344\343\377\212\377\377\377\377\1\342\351\347\377\202" \
-  "\223\254\247\377\1\267\307\304\377\213\333\343\342\377\1\300\316\314" \
-  "\377\202\223\254\247\377\1\327\340\336\377\212\377\377\377\377\1\346" \
-  "\354\353\377\202\223\254\247\377\1\265\306\302\377\377\333\343\342\377" \
-  "\206\333\343\342\377\1k\201|\377\202Slg\377\1\216\240\235\377\227\333" \
-  "\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343" \
-  "\342\377\222\333\343\342\377\5\332\342\341\377\235\264\257\377\223\254" \
-  "\247\377\237\265\261\377\375\376\375\377\212\377\377\377\377\4\264\306" \
-  "\302\377\223\254\247\377\224\255\250\377\324\335\334\377\213\333\343" \
-  "\342\377\4\331\341\340\377\230\260\253\377\223\254\247\377\252\275\271" \
-  "\377\213\377\377\377\377\4\250\274\270\377\223\254\247\377\230\260\253" \
-  "\377\331\341\340\377\377\333\343\342\377\205\333\343\342\377\5\301\315" \
-  "\313\377Yrm\377Slg\377Umh\377\277\313\311\377\226\333\343\342\377\1\202" \
-  "\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\222\333" \
-  "\343\342\377\1\307\324\322\377\202\223\254\247\377\1\313\327\324\377" \
-  "\212\377\377\377\377\4\362\365\364\377\224\254\250\377\223\254\247\377" \
-  "\253\276\273\377\215\333\343\342\377\1\264\305\302\377\202\223\254\247" \
-  "\377\1\350\356\355\377\212\377\377\377\377\1\325\337\335\377\202\223" \
-  "\254\247\377\1\300\316\314\377\377\333\343\342\377\206\333\343\342\377" \
-  "\5\265\302\300\377Umh\377Slg\377]up\377\301\314\312\377\225\333\343\342" \
-  "\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\222\333\343\342\377\4\251\274\271\377\223\254\247\377\225\256\251\377" \
-  "\366\370\367\377\212\377\377\377\377\1\306\323\321\377\202\223\254\247" \
-  "\377\1\312\326\324\377\215\333\343\342\377\1\322\334\332\377\202\223" \
-  "\254\247\377\1\273\313\310\377\212\377\377\377\377\4\373\374\373\377" \
-  "\232\261\255\377\223\254\247\377\242\267\263\377\377\333\343\342\377" \
-  "\207\333\343\342\377\6\267\304\302\377e{w\377Slg\377Vni\377\224\245\242" \
-  "\377\321\332\331\377\223\333\343\342\377\1\202\225\221\377\202Slg\377" \
-  "\1\243\262\257\377\377\333\343\342\377\221\333\343\342\377\1\322\334" \
-  "\332\377\202\223\254\247\377\1\271\311\306\377\212\377\377\377\377\4" \
-  "\374\374\374\377\233\262\256\377\223\254\247\377\240\266\261\377\217" \
-  "\333\343\342\377\4\251\275\271\377\223\254\247\377\226\256\251\377\366" \
-  "\370\370\377\212\377\377\377\377\1\304\321\317\377\202\223\254\247\377" \
-  "\1\314\327\325\377\377\333\343\342\377\203\333\343\342\377\1\330\340" \
-  "\337\377\203\322\333\332\377\2\315\326\325\377\207\232\226\377\202Sl" \
-  "g\377\6Vni\377|\220\214\377\234\254\251\377\264\301\277\377\303\316\314" \
-  "\377\314\325\324\377\216\322\333\332\377\1\177\223\217\377\202Slg\377" \
-  "\1\243\262\257\377\377\333\343\342\377\221\333\343\342\377\1\264\305" \
-  "\302\377\202\223\254\247\377\1\346\353\352\377\212\377\377\377\377\1" \
-  "\330\341\337\377\202\223\254\247\377\1\276\315\312\377\217\333\343\342" \
-  "\377\1\307\324\322\377\202\223\254\247\377\1\315\330\326\377\212\377" \
-  "\377\377\377\1\357\362\362\377\202\223\254\247\377\1\256\300\275\377" \
-  "\377\333\343\342\377\203\333\343\342\377\1\250\267\264\377\236Slg\377" \
-  "\1\243\262\257\377\377\333\343\342\377\220\333\343\342\377\4\331\341" \
-  "\340\377\230\260\253\377\223\254\247\377\247\273\267\377\213\377\377" \
-  "\377\377\4\252\276\272\377\223\254\247\377\227\257\252\377\330\340\337" \
-  "\377\217\333\343\342\377\5\332\342\341\377\236\264\260\377\223\254\247" \
-  "\377\240\266\262\377\376\376\376\377\212\377\377\377\377\4\261\303\277" \
-  "\377\223\254\247\377\225\255\250\377\325\336\335\377\377\333\343\342" \
-  "\377\202\333\343\342\377\1\250\267\264\377\236Slg\377\1\243\262\257\377" \
-  "\377\333\343\342\377\220\333\343\342\377\1\300\316\314\377\202\223\254" \
-  "\247\377\1\324\336\334\377\212\377\377\377\377\1\351\356\355\377\202" \
-  "\223\254\247\377\1\262\304\301\377\221\333\343\342\377\1\273\313\310" \
-  "\377\202\223\254\247\377\1\336\345\344\377\212\377\377\377\377\1\336" \
-  "\346\344\377\202\223\254\247\377\1\271\311\306\377\377\333\343\342\377" \
-  "\202\333\343\342\377\1\250\267\264\377\236Slg\377\1\243\262\257\377\377" \
-  "\333\343\342\377\220\333\343\342\377\4\241\267\263\377\223\254\247\377" \
-  "\231\261\254\377\372\373\373\377\212\377\377\377\377\1\274\313\310\377" \
-  "\202\223\254\247\377\1\320\333\331\377\221\333\343\342\377\4\326\337" \
-  "\336\377\226\256\251\377\223\254\247\377\261\303\277\377\212\377\377" \
-  "\377\377\5\376\376\376\377\240\266\262\377\223\254\247\377\234\262\256" \
-  "\377\332\342\341\377\377\333\343\342\377\2\333\343\342\377\250\267\264" \
-  "\377\236Slg\377\1\243\262\257\377\377\333\343\342\377\217\333\343\342" \
-  "\377\1\314\327\325\377\202\223\254\247\377\1\303\321\316\377\212\377" \
-  "\377\377\377\4\367\371\370\377\226\256\251\377\223\254\247\377\247\273" \
-  "\267\377\223\333\343\342\377\1\260\302\277\377\202\223\254\247\377\1" \
-  "\357\362\362\377\212\377\377\377\377\1\315\330\326\377\202\223\254\247" \
-  "\377\1\305\322\320\377\377\333\343\342\377\2\333\343\342\377\250\267" \
-  "\264\377\236Slg\377\1\243\262\257\377\377\333\343\342\377\217\333\343" \
-  "\342\377\1\255\300\274\377\202\223\254\247\377\1\357\363\362\377\212" \
-  "\377\377\377\377\1\315\330\326\377\202\223\254\247\377\1\305\322\320" \
-  "\377\223\333\343\342\377\1\316\331\327\377\202\223\254\247\377\1\302" \
-  "\320\315\377\212\377\377\377\377\4\366\370\370\377\226\256\251\377\223" \
-  "\254\247\377\247\273\267\377\377\333\343\342\377\2\333\343\342\377\250" \
-  "\267\264\377\202Slg\377\1u\211\205\377\230\270\305\303\377\1v\213\207" \
-  "\377\202Slg\377\1\243\262\257\377\377\333\343\342\377\216\333\343\342" \
-  "\377\4\325\336\335\377\224\255\250\377\223\254\247\377\261\303\277\377" \
-  "\212\377\377\377\377\5\376\376\376\377\240\266\262\377\223\254\247\377" \
-  "\234\263\256\377\332\342\341\377\224\333\343\342\377\4\244\271\265\377" \
-  "\223\254\247\377\231\261\254\377\372\373\373\377\212\377\377\377\377" \
-  "\1\273\313\310\377\202\223\254\247\377\1\320\333\331\377\377\333\343" \
-  "\342\377\1\250\267\264\377\202Slg\377\1\200\224\220\377\230\333\343\342" \
-  "\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\216\333\343\342\377\1\271\311\306\377\202\223\254\247\377\1\337\346" \
-  "\345\377\212\377\377\377\377\1\336\346\344\377\202\223\254\247\377\1" \
-  "\271\311\306\377\225\333\343\342\377\1\303\320\316\377\202\223\254\247" \
-  "\377\1\323\335\333\377\212\377\377\377\377\1\351\356\355\377\202\223" \
-  "\254\247\377\1\262\304\300\377\377\333\343\342\377\1\250\267\264\377" \
-  "\202Slg\377\1\200\224\220\377\230\333\343\342\377\1\202\225\221\377\202" \
-  "Slg\377\1\243\262\257\377\377\333\343\342\377\215\333\343\342\377\5\332" \
-  "\342\341\377\233\262\256\377\223\254\247\377\241\267\262\377\376\376" \
-  "\376\377\212\377\377\377\377\4\261\303\277\377\223\254\247\377\225\255" \
-  "\250\377\325\336\335\377\225\333\343\342\377\4\331\342\341\377\232\261" \
-  "\255\377\223\254\247\377\246\272\266\377\213\377\377\377\377\4\252\275" \
-  "\271\377\223\254\247\377\227\257\252\377\327\340\337\377\376\333\343" \
-  "\342\377\1\250\267\264\377\202Slg\377\1\200\224\220\377\230\333\343\342" \
-  "\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\377\333\343\342\377" \
-  "\215\333\343\342\377\1\304\322\317\377\202\223\254\247\377\1\315\331" \
-  "\326\377\212\377\377\377\377\1\357\363\362\377\202\223\254\247\377\1" \
-  "\256\300\275\377\227\333\343\342\377\1\267\307\304\377\202\223\254\247" \
-  "\377\1\345\353\351\377\212\377\377\377\377\1\330\341\337\377\202\223" \
-  "\254\247\377\1\276\315\312\377\376\333\343\342\377\1\250\267\264\377" \
-  "\202Slg\377\1\200\224\220\377\230\333\343\342\377\1\202\225\221\377\202" \
-  "Slg\377\1\243\262\257\377\377\333\343\342\377\215\333\343\342\377\4\246" \
-  "\272\266\377\223\254\247\377\226\256\252\377\367\371\370\377\212\377" \
-  "\377\377\377\1\302\320\315\377\202\223\254\247\377\1\314\330\326\377" \
-  "\227\333\343\342\377\4\324\335\334\377\224\255\250\377\223\254\247\377" \
-  "\267\310\305\377\212\377\377\377\377\4\374\374\374\377\233\262\256\377" \
-  "\223\254\247\377\237\265\261\377\376\333\343\342\377\1\311\324\322\377" \
-  "\202\254\271\267\377\1\274\307\306\377\230\333\343\342\377\1\325\336" \
-  "\335\377\202\322\333\332\377\1\327\340\337\377\377\333\343\342\377\214" \
-  "\333\343\342\377\1\320\332\331\377\202\223\254\247\377\1\274\313\310" \
-  "\377\212\377\377\377\377\4\372\373\373\377\231\261\254\377\223\254\247" \
-  "\377\242\267\263\377\231\333\343\342\377\4\253\276\273\377\223\254\247" \
-  "\377\225\255\250\377\364\366\366\377\212\377\377\377\377\1\306\323\321" \
-  "\377\202\223\254\247\377\1\311\325\323\377\377\333\343\342\377\377\333" \
-  "\343\342\377\252\333\343\342\377\1\262\303\300\377\202\223\254\247\377" \
-  "\1\351\356\355\377\212\377\377\377\377\1\324\336\334\377\202\223\254" \
-  "\247\377\1\301\317\314\377\231\333\343\342\377\1\312\326\324\377\202" \
-  "\223\254\247\377\1\311\325\323\377\212\377\377\377\377\4\362\365\364" \
-  "\377\224\254\250\377\223\254\247\377\253\276\273\377\377\333\343\342" \
-  "\377\377\333\343\342\377\251\333\343\342\377\4\327\340\337\377\227\257" \
-  "\252\377\223\254\247\377\253\276\272\377\213\377\377\377\377\4\246\273" \
-  "\267\377\223\254\247\377\230\260\253\377\331\341\340\377\213\333\343" \
-  "\342\377\3\306\323\320\377\274\313\311\377\316\330\327\377\214\333\343" \
-  "\342\377\4\237\265\261\377\223\254\247\377\236\264\257\377\375\375\375" \
-  "\377\212\377\377\377\377\4\264\306\302\377\223\254\247\377\224\255\250" \
-  "\377\323\335\334\377\377\333\343\342\377\225\333\343\342\377\5|\220\214" \
-  "\377x\214\210\377\217\241\235\377\266\302\300\377\331\342\341\377\377" \
-  "\333\343\342\377\216\333\343\342\377\1\275\314\312\377\202\223\254\247" \
-  "\377\1\330\341\337\377\212\377\377\377\377\1\346\353\352\377\202\223" \
-  "\254\247\377\1\265\306\303\377\212\333\343\342\377\2\331\341\340\377" \
-  "\250\275\271\377\203\223\254\247\377\1\240\266\262\377\213\333\343\342" \
-  "\377\1\276\315\312\377\202\223\254\247\377\1\332\343\341\377\212\377" \
-  "\377\377\377\1\342\351\347\377\202\223\254\247\377\1\267\307\304\377" \
-  "\374\333\343\342\377\1\315\326\325\377\202\264\301\277\377\1\277\312" \
-  "\310\377\224\333\343\342\377\1h\177z\377\203Slg\377\2h\177z\377\267\303" \
-  "\301\377\377\333\343\342\377\215\333\343\342\377\4\237\265\261\377\223" \
-  "\254\247\377\234\263\256\377\374\375\374\377\212\377\377\377\377\1\270" \
-  "\310\305\377\202\223\254\247\377\1\322\334\333\377\212\333\343\342\377" \
-  "\7\306\323\320\377\223\254\247\377\236\264\260\377\303\321\316\377\236" \
-  "\265\260\377\223\254\247\377\305\323\320\377\212\333\343\342\377\4\330" \
-  "\340\337\377\227\257\252\377\223\254\247\377\255\300\274\377\213\377" \
-  "\377\377\377\4\243\271\264\377\223\254\247\377\232\261\254\377\331\341" \
-  "\340\377\373\333\343\342\377\1\250\267\264\377\202Slg\377\1x\214\210" \
-  "\377\224\333\343\342\377\1h\177z\377\204Slg\377\2Tmh\377\251\270\265" \
-  "\377\377\333\343\342\377\213\333\343\342\377\1\311\325\323\377\202\223" \
-  "\254\247\377\1\307\324\321\377\212\377\377\377\377\4\364\367\366\377" \
-  "\225\255\250\377\223\254\247\377\251\275\271\377\213\333\343\342\377" \
-  "\7\260\302\277\377\223\254\247\377\325\336\334\377\377\377\377\377\327" \
-  "\340\337\377\223\254\247\377\250\274\271\377\213\333\343\342\377\1\262" \
-  "\304\300\377\202\223\254\247\377\1\353\360\357\377\212\377\377\377\377" \
-  "\1\321\333\331\377\202\223\254\247\377\1\302\320\316\377\373\333\343" \
-  "\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377\224\333\343\342" \
-  "\377\1h\177z\377\205Slg\377\2Xpk\377\311\323\322\377\377\333\343\342" \
-  "\377\212\333\343\342\377\4\253\276\272\377\223\254\247\377\224\254\250" \
-  "\377\362\365\364\377\212\377\377\377\377\1\312\326\323\377\202\223\254" \
-  "\247\377\1\310\324\322\377\213\333\343\342\377\7\255\300\275\377\223" \
-  "\254\247\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254" \
-  "\247\377\245\272\265\377\213\333\343\342\377\1\320\333\331\377\202\223" \
-  "\254\247\377\1\276\315\312\377\212\377\377\377\377\4\371\372\372\377" \
-  "\230\257\253\377\223\254\247\377\244\271\265\377\373\333\343\342\377" \
-  "\1\250\267\264\377\202Slg\377\1x\214\210\377\224\333\343\342\377\4\303" \
-  "\316\314\377\260\275\273\377\233\253\250\377f}x\377\203Slg\377\1\217" \
-  "\241\235\377\377\333\343\342\377\211\333\343\342\377\4\323\335\333\377" \
-  "\224\254\247\377\223\254\247\377\265\306\303\377\212\377\377\377\377" \
-  "\4\375\375\375\377\236\264\260\377\223\254\247\377\236\264\260\377\214" \
-  "\333\343\342\377\7\255\300\275\377\223\254\247\377\341\350\346\377\377" \
-  "\377\377\377\356\362\361\377\223\254\247\377\245\272\265\377\214\333" \
-  "\343\342\377\4\247\273\267\377\223\254\247\377\227\257\252\377\370\372" \
-  "\371\377\212\377\377\377\377\1\277\316\313\377\202\223\254\247\377\1" \
-  "\316\331\327\377\372\333\343\342\377\1\250\267\264\377\202Slg\377\1x" \
-  "\214\210\377\227\333\343\342\377\2\331\342\341\377\211\233\230\377\202" \
-  "Slg\377\1d{v\377\377\333\343\342\377\211\333\343\342\377\1\266\307\304" \
-  "\377\202\223\254\247\377\1\343\351\350\377\212\377\377\377\377\1\333" \
-  "\343\342\377\202\223\254\247\377\1\274\313\310\377\214\333\343\342\377" \
-  "\7\255\300\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356" \
-  "\362\361\377\223\254\247\377\245\272\265\377\214\333\343\342\377\1\305" \
-  "\322\320\377\202\223\254\247\377\1\317\332\330\377\212\377\377\377\377" \
-  "\1\354\361\360\377\202\223\254\247\377\1\260\302\276\377\372\333\343" \
-  "\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377\230\333\343\342" \
-  "\377\2\326\337\336\377]tp\377\202Slg\377\1\317\331\327\377\377\333\343" \
-  "\342\377\207\333\343\342\377\4\331\341\340\377\232\261\254\377\223\254" \
-  "\247\377\244\271\265\377\213\377\377\377\377\4\256\300\275\377\223\254" \
-  "\247\377\226\256\251\377\327\337\336\377\214\333\343\342\377\7\255\300" \
-  "\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356\362\361" \
-  "\377\223\254\247\377\245\272\265\377\214\333\343\342\377\5\332\342\341" \
-  "\377\234\262\256\377\223\254\247\377\243\270\264\377\376\376\376\377" \
-  "\212\377\377\377\377\4\256\300\275\377\223\254\247\377\226\256\251\377" \
-  "\326\337\336\377\371\333\343\342\377\1\250\267\264\377\202Slg\377\1x" \
-  "\214\210\377\231\333\343\342\377\1v\212\206\377\202Slg\377\1\301\315" \
-  "\313\377\377\333\343\342\377\207\333\343\342\377\1\302\320\315\377\202" \
-  "\223\254\247\377\1\321\334\332\377\212\377\377\377\377\1\354\361\360" \
-  "\377\202\223\254\247\377\1\260\302\277\377\215\333\343\342\377\7\255" \
-  "\300\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356\362" \
-  "\361\377\223\254\247\377\245\272\265\377\215\333\343\342\377\1\271\311" \
-  "\306\377\202\223\254\247\377\1\341\350\346\377\212\377\377\377\377\1" \
-  "\333\343\342\377\202\223\254\247\377\1\273\313\310\377\371\333\343\342" \
-  "\377\1\250\267\264\377\202Slg\377\1x\214\210\377\231\333\343\342\377" \
-  "\1\177\222\217\377\202Slg\377\1\272\306\304\377\377\333\343\342\377\207" \
-  "\333\343\342\377\4\243\270\264\377\223\254\247\377\230\260\253\377\371" \
-  "\372\372\377\212\377\377\377\377\1\277\316\313\377\202\223\254\247\377" \
-  "\1\316\331\330\377\215\333\343\342\377\7\255\300\275\377\223\254\247" \
-  "\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254\247\377" \
-  "\245\272\265\377\215\333\343\342\377\4\325\336\335\377\225\255\250\377" \
-  "\223\254\247\377\264\305\301\377\212\377\377\377\377\5\375\375\375\377" \
-  "\236\265\260\377\223\254\247\377\235\264\257\377\332\342\341\377\370" \
-  "\333\343\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377\231\333" \
-  "\343\342\377\1i\177{\377\202Slg\377\1\276\312\310\377\377\333\343\342" \
-  "\377\206\333\343\342\377\1\316\331\327\377\202\223\254\247\377\7\300" \
-  "\316\313\377\377\377\377\377\327\340\337\377\272\312\306\377\254\277" \
-  "\273\377\276\315\312\377\343\352\350\377\204\377\377\377\377\4\371\372" \
-  "\372\377\230\257\253\377\223\254\247\377\245\271\265\377\216\333\343" \
-  "\342\377\7\255\300\275\377\223\254\247\377\341\350\346\377\377\377\377" \
-  "\377\356\362\361\377\223\254\247\377\245\272\265\377\216\333\343\342" \
-  "\377\1\256\300\275\377\202\223\254\247\377\1\361\364\364\377\204\377" \
-  "\377\377\377\7\350\355\354\377\300\317\314\377\254\300\274\377\267\310" \
-  "\304\377\323\335\333\377\376\376\376\377\312\326\324\377\202\223\254" \
-  "\247\377\1\307\323\321\377\370\333\343\342\377\1\250\267\264\377\202" \
-  "Slg\377\1x\214\210\377\230\333\343\342\377\1\254\272\270\377\203Slg\377" \
-  "\1\307\321\320\377\354\333\343\342\377\1\205\241\234\377\210|\233\225" \
-  "\377\1\262\303\300\377\217\312\326\324\377\1\251\274\271\377\202\223" \
-  "\254\247\377\2\350\355\354\377\257\301\275\377\205\223\254\247\377\1" \
-  "\301\317\315\377\203\377\377\377\377\1\320\333\331\377\202\223\254\247" \
-  "\377\1\267\310\305\377\216\312\326\324\377\7\247\273\267\377\223\254" \
-  "\247\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254\247" \
-  "\377\240\266\262\377\216\312\326\324\377\1\276\315\312\377\202\223\254" \
-  "\247\377\1\305\322\320\377\203\377\377\377\377\2\312\327\324\377\224" \
-  "\255\250\377\204\223\254\247\377\5\251\275\271\377\354\360\360\377\225" \
-  "\255\251\377\223\254\247\377\243\270\264\377\217\312\326\324\377\1\273" \
-  "\313\310\377\210|\233\225\377\2\177\235\227\377\330\341\337\377\325\333" \
-  "\343\342\377\1\273\307\305\377\210\270\305\303\377\1\223\244\241\377" \
-  "\202Slg\377\1n\204\200\377\223\270\305\303\377\6\267\303\301\377\257" \
-  "\274\272\377\247\265\263\377\232\252\247\377t\210\204\377Tmh\377\202" \
-  "Slg\377\2Woj\377\330\340\337\377\354\333\343\342\377\1u\225\217\377\227" \
-  "o\221\212\377\15q\222\213\377\221\252\245\377\223\254\247\377\256\301" \
-  "\275\377\277\316\313\377\223\254\247\377\242\267\263\377\334\344\343" \
-  "\377\354\360\357\377\323\335\333\377\232\261\255\377\223\254\247\377" \
-  "\327\340\337\377\202\377\377\377\377\3\243\271\264\377\223\254\247\377" \
-  "\217\251\243\377\217o\221\212\377\7\205\242\234\377\223\254\247\377\341" \
-  "\350\346\377\377\377\377\377\356\362\361\377\223\254\247\377\212\245" \
-  "\240\377\217o\221\212\377\22\213\246\240\377\223\254\247\377\233\262" \
-  "\255\377\373\374\374\377\377\377\377\377\343\352\350\377\223\254\247" \
-  "\377\226\257\252\377\316\331\327\377\354\360\357\377\340\347\345\377" \
-  "\250\274\270\377\223\254\247\377\265\306\303\377\271\311\306\377\223" \
-  "\254\247\377\222\253\246\377s\224\215\377\230o\221\212\377\1\327\340" \
-  "\337\377\325\333\343\342\377\1\\so\377\247Slg\377\1t\210\204\377\355" \
-  "\333\343\342\377\1u\225\217\377\227o\221\212\377\1~\234\226\377\202\223" \
-  "\254\247\377\4\331\342\340\377\224\255\250\377\230\260\253\377\361\365" \
-  "\364\377\203\377\377\377\377\5\341\350\346\377\223\254\247\377\247\274" \
-  "\270\377\377\377\377\377\342\351\347\377\202\223\254\247\377\1\200\236" \
-  "\230\377\217o\221\212\377\7\205\242\234\377\223\254\247\377\341\350\346" \
-  "\377\377\377\377\377\356\362\361\377\223\254\247\377\212\245\240\377" \
-  "\217o\221\212\377\1|\232\224\377\202\223\254\247\377\5\326\340\336\377" \
-  "\377\377\377\377\262\304\301\377\223\254\247\377\325\337\335\377\203" \
-  "\377\377\377\377\4\370\371\371\377\235\264\257\377\223\254\247\377\332" \
-  "\342\340\377\202\223\254\247\377\1\202\237\231\377\230o\221\212\377\1" \
-  "\327\340\337\377\325\333\343\342\377\1\\so\377\247Slg\377\1\253\271\266" \
-  "\377\355\333\343\342\377\1u\225\217\377\227o\221\212\377\6\215\250\242" \
-  "\377\223\254\247\377\236\265\260\377\344\352\350\377\223\254\247\377" \
-  "\262\304\300\377\205\377\377\377\377\7\233\262\255\377\225\255\250\377" \
-  "\374\374\374\377\264\306\302\377\223\254\247\377\222\253\246\377r\223" \
-  "\214\377\217o\221\212\377\7\205\242\234\377\223\254\247\377\341\350\346" \
-  "\377\377\377\377\377\356\362\361\377\223\254\247\377\212\245\240\377" \
-  "\220o\221\212\377\7\220\251\244\377\223\254\247\377\251\275\271\377\377" \
-  "\377\377\377\235\264\257\377\223\254\247\377\372\373\373\377\204\377" \
-  "\377\377\377\7\275\314\311\377\223\254\247\377\333\343\342\377\247\273" \
-  "\267\377\223\254\247\377\220\251\244\377p\221\212\377\227o\221\212\377" \
-  "\1\327\340\337\377\325\333\343\342\377\1\\so\377\246Slg\377\2u\211\205" \
-  "\377\331\341\340\377\355\333\343\342\377\1u\225\217\377\226o\221\212" \
-  "\377\1y\230\222\377\202\223\254\247\377\4\312\326\324\377\353\360\357" \
-  "\377\223\254\247\377\254\277\273\377\204\377\377\377\377\7\375\375\375" \
-  "\377\227\257\252\377\230\260\253\377\361\364\363\377\224\254\250\377" \
-  "\223\254\247\377\206\242\234\377\220o\221\212\377\7\205\242\234\377\223" \
-  "\254\247\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254" \
-  "\247\377\212\245\240\377\220o\221\212\377\1\201\237\231\377\202\223\254" \
-  "\247\377\4\350\355\354\377\243\270\264\377\223\254\247\377\365\367\367" \
-  "\377\204\377\377\377\377\4\267\310\304\377\223\254\247\377\340\347\345" \
-  "\377\325\336\334\377\202\223\254\247\377\1|\233\224\377\227o\221\212" \
-  "\377\1\327\340\337\377\325\333\343\342\377\1\\so\377\245Slg\377\2}\220" \
-  "\215\377\321\332\331\377\356\333\343\342\377\1u\225\217\377\226o\221" \
-  "\212\377\10\210\243\236\377\223\254\247\377\225\255\251\377\365\367\367" \
-  "\377\376\376\376\377\231\261\254\377\223\254\247\377\342\351\347\377" \
-  "\203\377\377\377\377\4\315\331\326\377\223\254\247\377\260\302\276\377" \
-  "\306\323\321\377\202\223\254\247\377\1w\227\220\377\220o\221\212\377" \
-  "\7\205\242\234\377\223\254\247\377\341\350\346\377\377\377\377\377\356" \
-  "\362\361\377\223\254\247\377\212\245\240\377\220o\221\212\377\7s\224" \
-  "\215\377\222\253\246\377\223\254\247\377\272\312\307\377\273\313\307" \
-  "\377\223\254\247\377\301\317\315\377\203\377\377\377\377\10\354\360\357" \
-  "\377\226\256\251\377\225\256\251\377\366\370\370\377\373\374\373\377" \
-  "\232\261\254\377\223\254\247\377\213\246\240\377\227o\221\212\377\1\327" \
-  "\340\337\377\325\333\343\342\377\1\\so\377\241Slg\377\4Xpk\377n\204\200" \
-  "\377\213\235\232\377\274\310\306\377\360\333\343\342\377\1u\225\217\377" \
-  "\210o\221\212\377\1u\225\216\377\214x\230\221\377\4{\232\223\377\222" \
-  "\253\246\377\223\254\247\377\271\311\306\377\202\377\377\377\377\14\324" \
-  "\336\334\377\223\254\247\377\225\256\251\377\277\316\313\377\321\334" \
-  "\331\377\266\307\303\377\223\254\247\377\225\256\251\377\347\354\353" \
-  "\377\233\262\256\377\223\254\247\377\215\250\242\377\221x\230\221\377" \
-  "\7\210\244\237\377\223\254\247\377\341\350\346\377\377\377\377\377\356" \
-  "\362\361\377\223\254\247\377\214\247\241\377\221x\230\221\377\14\212" \
-  "\245\240\377\223\254\247\377\225\256\251\377\352\356\356\377\231\260" \
-  "\253\377\223\254\247\377\260\302\277\377\320\333\331\377\303\321\316" \
-  "\377\230\260\253\377\223\254\247\377\312\326\324\377\202\377\377\377" \
-  "\377\1\303\321\316\377\202\223\254\247\377\1}\234\225\377\214x\230\221" \
-  "\377\1v\226\217\377\211o\221\212\377\1\327\340\337\377\325\333\343\342" \
-  "\377\1\317\330\327\377\210\316\327\326\377\1\240\260\255\377\202Slg\377" \
-  "\1t\211\205\377\223\316\327\326\377\2\320\331\330\377\327\340\337\377" \
-  "\364\333\343\342\377\1\236\265\260\377\210\232\262\255\377\1\307\323" \
-  "\321\377\214\333\343\342\377\1\264\305\302\377\202\223\254\247\377\1" \
-  "\346\354\353\377\203\377\377\377\377\2\314\330\325\377\226\256\251\377" \
-  "\203\223\254\247\377\3\233\263\256\377\335\345\343\377\330\341\337\377" \
-  "\202\223\254\247\377\1\276\315\312\377\221\333\343\342\377\7\255\300" \
-  "\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356\362\361" \
-  "\377\223\254\247\377\245\272\265\377\221\333\343\342\377\1\307\324\322" \
-  "\377\202\223\254\247\377\3\314\327\325\377\343\352\351\377\237\265\261" \
-  "\377\203\223\254\247\377\3\224\255\250\377\305\322\320\377\375\376\376" \
-  "\377\202\377\377\377\377\1\360\363\362\377\202\223\254\247\377\1\255" \
-  "\300\274\377\214\333\343\342\377\1\317\331\330\377\211\232\262\255\377" \
-  "\1\331\341\340\377\336\333\343\342\377\1\250\267\264\377\202Slg\377\1" \
-  "x\214\210\377\377\333\343\342\377\237\333\343\342\377\4\330\341\340\377" \
-  "\230\260\253\377\223\254\247\377\250\274\270\377\205\377\377\377\377" \
-  "\12\360\364\363\377\325\336\334\377\307\324\321\377\331\342\340\377\367" \
-  "\371\370\377\377\377\377\377\252\276\272\377\223\254\247\377\227\257" \
-  "\252\377\330\340\337\377\221\333\343\342\377\7\255\300\275\377\223\254" \
-  "\247\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254\247" \
-  "\377\245\272\265\377\221\333\343\342\377\12\332\342\341\377\236\264\260" \
-  "\377\223\254\247\377\240\266\261\377\375\376\375\377\371\373\373\377" \
-  "\333\343\342\377\310\325\322\377\322\334\332\377\355\361\361\377\205" \
-  "\377\377\377\377\4\262\304\300\377\223\254\247\377\224\255\250\377\325" \
-  "\336\335\377\364\333\343\342\377\1\250\267\264\377\202Slg\377\1x\214" \
-  "\210\377\377\333\343\342\377\237\333\343\342\377\1\277\316\313\377\202" \
-  "\223\254\247\377\1\325\337\335\377\212\377\377\377\377\1\351\356\355" \
-  "\377\202\223\254\247\377\1\263\304\301\377\222\333\343\342\377\7\255" \
-  "\300\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356\362" \
-  "\361\377\223\254\247\377\245\272\265\377\222\333\343\342\377\1\274\313" \
-  "\310\377\202\223\254\247\377\1\335\345\343\377\212\377\377\377\377\1" \
-  "\337\346\345\377\202\223\254\247\377\1\271\311\306\377\364\333\343\342" \
-  "\377\1\250\267\264\377\202Slg\377\1x\214\210\377\377\333\343\342\377" \
-  "\237\333\343\342\377\4\241\267\263\377\223\254\247\377\232\261\255\377" \
-  "\373\374\373\377\212\377\377\377\377\1\274\313\310\377\202\223\254\247" \
-  "\377\1\320\333\331\377\222\333\343\342\377\7\255\300\275\377\223\254" \
-  "\247\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254\247" \
-  "\377\245\272\265\377\222\333\343\342\377\4\327\337\336\377\226\256\251" \
-  "\377\223\254\247\377\260\302\276\377\212\377\377\377\377\5\376\376\376" \
-  "\377\241\267\263\377\223\254\247\377\233\262\256\377\332\342\341\377" \
-  "\363\333\343\342\377\1\264\300\276\377\202p\205\201\377\1\215\237\234" \
-  "\377\377\333\343\342\377\236\333\343\342\377\1\313\327\325\377\202\223" \
-  "\254\247\377\1\304\321\317\377\212\377\377\377\377\4\367\371\370\377" \
-  "\226\256\251\377\223\254\247\377\247\273\267\377\223\333\343\342\377" \
-  "\7\255\300\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356" \
-  "\362\361\377\223\254\247\377\245\272\265\377\223\333\343\342\377\1\260" \
-  "\302\277\377\202\223\254\247\377\1\356\362\361\377\212\377\377\377\377" \
-  "\1\316\331\327\377\202\223\254\247\377\1\304\321\317\377\377\333\343" \
-  "\342\377\377\333\343\342\377\226\333\343\342\377\1\255\300\274\377\202" \
-  "\223\254\247\377\1\360\363\363\377\212\377\377\377\377\1\315\330\326" \
-  "\377\202\223\254\247\377\1\305\322\320\377\223\333\343\342\377\7\255" \
-  "\300\275\377\223\254\247\377\341\350\346\377\377\377\377\377\356\362" \
-  "\361\377\223\254\247\377\245\272\265\377\223\333\343\342\377\1\316\331" \
-  "\327\377\202\223\254\247\377\1\301\317\314\377\212\377\377\377\377\4" \
-  "\367\371\371\377\226\256\252\377\223\254\247\377\246\272\266\377\377" \
-  "\333\343\342\377\377\333\343\342\377\225\333\343\342\377\4\325\336\335" \
-  "\377\224\255\250\377\223\254\247\377\262\304\300\377\212\377\377\377" \
-  "\377\5\376\376\376\377\240\266\262\377\223\254\247\377\234\263\256\377" \
-  "\332\342\341\377\223\333\343\342\377\7\255\300\275\377\223\254\247\377" \
-  "\341\350\346\377\377\377\377\377\356\362\361\377\223\254\247\377\245" \
-  "\272\265\377\224\333\343\342\377\4\244\271\265\377\223\254\247\377\230" \
-  "\260\253\377\372\373\373\377\212\377\377\377\377\1\274\314\311\377\202" \
-  "\223\254\247\377\1\317\332\330\377\377\333\343\342\377\377\333\343\342" \
-  "\377\224\333\343\342\377\1\270\310\306\377\202\223\254\247\377\1\340" \
-  "\347\345\377\212\377\377\377\377\1\337\346\345\377\202\223\254\247\377" \
-  "\1\272\311\307\377\224\333\343\342\377\7\255\300\275\377\223\254\247" \
-  "\377\341\350\346\377\377\377\377\377\356\362\361\377\223\254\247\377" \
-  "\245\272\265\377\224\333\343\342\377\1\303\320\316\377\202\223\254\247" \
-  "\377\1\322\335\333\377\212\377\377\377\377\1\352\357\356\377\202\223" \
-  "\254\247\377\1\262\303\300\377\377\333\343\342\377\377\333\343\342\377" \
-  "\223\333\343\342\377\5\332\342\341\377\233\262\255\377\223\254\247\377" \
-  "\241\267\263\377\376\376\376\377\212\377\377\377\377\4\261\303\277\377" \
-  "\223\254\247\377\225\255\251\377\325\337\335\377\224\333\343\342\377" \
-  "\7\264\305\302\377\223\254\247\377\316\331\327\377\377\377\377\377\331" \
-  "\342\340\377\223\254\247\377\252\276\273\377\224\333\343\342\377\4\331" \
-  "\342\341\377\232\261\255\377\223\254\247\377\245\272\266\377\213\377" \
-  "\377\377\377\4\253\276\273\377\223\254\247\377\226\257\252\377\327\340" \
-  "\337\377\377\333\343\342\377\206\333\343\342\377\6\330\340\337\377\304" \
-  "\316\315\377\255\272\270\377\254\272\270\377\273\307\305\377\325\336" \
-  "\335\377\377\333\343\342\377\206\333\343\342\377\1\304\321\317\377\202" \
-  "\223\254\247\377\1\316\331\327\377\212\377\377\377\377\1\357\363\362" \
-  "\377\202\223\254\247\377\1\256\301\275\377\225\333\343\342\377\7\310" \
-  "\324\323\377\222\253\246\377\225\255\250\377\256\301\275\377\227\257" \
-  "\252\377\223\254\247\377\300\316\314\377\225\333\343\342\377\1\267\310" \
-  "\305\377\202\223\254\247\377\1\344\352\351\377\212\377\377\377\377\1" \
-  "\330\341\337\377\202\223\254\247\377\1\275\314\311\377\377\333\343\342" \
-  "\377\204\333\343\342\377\3\320\331\330\377\205\227\224\377Uni\377\204" \
-  "Slg\377\3Xpk\377\201\225\221\377\310\323\321\377\377\333\343\342\377" \
-  "\204\333\343\342\377\4\246\272\266\377\223\254\247\377\227\257\252\377" \
-  "\367\371\371\377\212\377\377\377\377\1\302\320\315\377\202\223\254\247" \
-  "\377\1\314\330\326\377\226\333\343\342\377\2\274\313\311\377\225\255" \
-  "\250\377\202\223\254\247\377\1\264\305\302\377\226\333\343\342\377\4" \
-  "\324\335\334\377\224\255\250\377\223\254\247\377\267\307\304\377\212" \
-  "\377\377\377\377\4\374\375\374\377\234\263\256\377\223\254\247\377\237" \
-  "\265\261\377\363\333\343\342\377\1\200\224\220\377\205t\211\205\377\1" \
-  "w\213\207\377\210\333\343\342\377\2\262\277\275\377\\to\377\210Slg\377" \
-  "\2Xql\377\252\270\266\377\377\333\343\342\377\202\333\343\342\377\1\317" \
-  "\332\330\377\202\223\254\247\377\1\275\314\311\377\212\377\377\377\377" \
-  "\4\372\373\373\377\231\261\254\377\223\254\247\377\242\270\263\377\230" \
-  "\333\343\342\377\3\330\341\340\377\313\326\324\377\327\337\336\377\230" \
-  "\333\343\342\377\4\253\276\273\377\223\254\247\377\224\255\250\377\363" \
-  "\366\366\377\212\377\377\377\377\1\307\324\321\377\202\223\254\247\377" \
-  "\1\311\325\323\377\361\333\343\342\377\1\275\311\307\377\206Slg\377\1" \
-  "Vni\377\207\333\343\342\377\2\306\321\317\377Yrm\377\212Slg\377\2Tmh" \
-  "\377\256\273\271\377\377\333\343\342\377\2\333\343\342\377\261\303\300" \
-  "\377\202\223\254\247\377\1\352\357\356\377\212\377\377\377\377\1\324" \
-  "\336\334\377\202\223\254\247\377\1\301\317\314\377\263\333\343\342\377" \
-  "\1\312\326\324\377\202\223\254\247\377\1\310\325\322\377\212\377\377" \
-  "\377\377\4\363\365\365\377\224\255\250\377\223\254\247\377\253\276\272" \
-  "\377\361\333\343\342\377\1\212\234\231\377\206Slg\377\1Vni\377\206\333" \
-  "\343\342\377\2\326\337\336\377l\201}\377\214Slg\377\2Xpk\377\313\325" \
-  "\323\377\376\333\343\342\377\4\327\340\337\377\226\257\252\377\223\254" \
-  "\247\377\253\277\273\377\213\377\377\377\377\4\247\273\267\377\223\254" \
-  "\247\377\231\260\254\377\331\341\340\377\264\333\343\342\377\4\240\266" \
-  "\261\377\223\254\247\377\235\263\257\377\374\375\375\377\212\377\377" \
-  "\377\377\4\266\307\303\377\223\254\247\377\224\254\247\377\323\335\333" \
-  "\377\357\333\343\342\377\2\331\342\341\377]up\377\204Slg\377\3czu\377" \
-  "\203\226\222\377\243\262\257\377\206\333\343\342\377\1\235\255\252\377" \
-  "\216Slg\377\1\177\222\217\377\376\333\343\342\377\1\275\314\311\377\202" \
-  "\223\254\247\377\1\331\342\340\377\212\377\377\377\377\1\346\353\352" \
-  "\377\202\223\254\247\377\1\265\306\303\377\265\333\343\342\377\1\276" \
-  "\315\312\377\202\223\254\247\377\1\331\342\340\377\212\377\377\377\377" \
-  "\1\343\351\350\377\202\223\254\247\377\1\266\307\304\377\357\333\343" \
-  "\342\377\1\276\311\307\377\204Slg\377\2\224\244\241\377\331\341\340\377" \
-  "\207\333\343\342\377\2\332\342\341\377f|x\377\205Slg\377\6byt\377\252" \
-  "\270\266\377\307\321\320\377\313\325\324\377\257\275\272\377\202\225" \
-  "\221\377\204Slg\377\1\313\325\323\377\375\333\343\342\377\4\237\265\260" \
-  "\377\223\254\247\377\235\263\257\377\374\375\375\377\212\377\377\377" \
-  "\377\1\270\310\305\377\202\223\254\247\377\1\322\334\333\377\265\333" \
-  "\343\342\377\4\330\340\337\377\227\257\252\377\223\254\247\377\254\277" \
-  "\273\377\213\377\377\377\377\4\244\271\265\377\223\254\247\377\231\261" \
-  "\254\377\331\341\340\377\356\333\343\342\377\1\227\250\245\377\203Sl" \
-  "g\377\1\255\273\271\377\211\333\343\342\377\1\266\303\301\377\205Slg" \
-  "\377\2l\202~\377\321\332\331\377\205\333\343\342\377\1\233\253\250\377" \
-  "\203Slg\377\1\232\252\247\377\374\333\343\342\377\1\310\325\323\377\202" \
-  "\223\254\247\377\1\307\324\322\377\212\377\377\377\377\4\364\367\366" \
-  "\377\225\255\250\377\223\254\247\377\251\275\271\377\267\333\343\342" \
-  "\377\1\262\304\301\377\202\223\254\247\377\1\353\357\356\377\212\377" \
-  "\377\377\377\1\322\334\332\377\202\223\254\247\377\1\302\320\315\377" \
-  "\356\333\343\342\377\1z\216\212\377\202Slg\377\1w\214\210\377\212\333" \
-  "\343\342\377\1\177\222\217\377\204Slg\377\2Tlg\377\277\312\310\377\207" \
-  "\333\343\342\377\1y\215\211\377\202Slg\377\1v\212\206\377\374\333\343" \
-  "\342\377\4\252\276\272\377\223\254\247\377\224\255\250\377\363\366\365" \
-  "\377\212\377\377\377\377\1\312\326\323\377\202\223\254\247\377\1\310" \
-  "\324\322\377\267\333\343\342\377\1\320\333\331\377\202\223\254\247\377" \
-  "\1\275\314\311\377\212\377\377\377\377\4\371\373\372\377\230\260\253" \
-  "\377\223\254\247\377\243\270\264\377\356\333\343\342\377\1ayt\377\202" \
-  "Slg\377\1\277\312\310\377\211\333\343\342\377\2\325\335\334\377Woj\377" \
-  "\204Slg\377\1\211\233\230\377\210\333\343\342\377\1\265\302\300\377\202" \
-  "Slg\377\1\\so\377\373\333\343\342\377\4\323\335\333\377\224\254\247\377" \
-  "\223\254\247\377\266\307\303\377\212\377\377\377\377\4\375\375\375\377" \
-  "\236\264\260\377\223\254\247\377\236\264\260\377\271\333\343\342\377" \
-  "\4\247\273\267\377\223\254\247\377\227\257\252\377\370\371\371\377\212" \
-  "\377\377\377\377\1\300\317\314\377\202\223\254\247\377\1\315\330\327" \
-  "\377\354\333\343\342\377\1\324\335\334\377\202Slg\377\1Xql\377\212\333" \
-  "\343\342\377\1\260\275\273\377\205Slg\377\1\301\315\313\377\211\333\343" \
-  "\342\377\1[sn\377\202Slg\377\1\315\327\325\377\372\333\343\342\377\1" \
-  "\266\306\303\377\202\223\254\247\377\1\343\352\350\377\212\377\377\377" \
-  "\377\1\333\343\342\377\202\223\254\247\377\1\274\313\311\377\271\333" \
-  "\343\342\377\1\305\322\320\377\202\223\254\247\377\1\317\332\330\377" \
-  "\212\377\377\377\377\1\356\361\361\377\202\223\254\247\377\1\257\301" \
-  "\276\377\354\333\343\342\377\1\312\324\323\377\202Slg\377\1l\201}\377" \
-  "\212\333\343\342\377\1\207\231\226\377\204Slg\377\1l\202~\377\212\333" \
-  "\343\342\377\1k\201|\377\202Slg\377\1\304\317\315\377\371\333\343\342" \
-  "\377\4\331\341\340\377\231\260\254\377\223\254\247\377\245\271\265\377" \
-  "\213\377\377\377\377\4\256\300\275\377\223\254\247\377\226\256\252\377" \
-  "\327\340\336\377\271\333\343\342\377\5\332\342\341\377\234\263\256\377" \
-  "\223\254\247\377\242\267\263\377\376\376\376\377\212\377\377\377\377" \
-  "\4\257\301\276\377\223\254\247\377\225\256\251\377\326\337\336\377\353" \
-  "\333\343\342\377\1\301\315\313\377\202Slg\377\1~\222\216\377\211\333" \
-  "\343\342\377\2\332\342\341\377_vr\377\204Slg\377\1\237\257\254\377\212" \
-  "\333\343\342\377\1y\215\211\377\202Slg\377\1\275\310\306\377\371\333" \
-  "\343\342\377\1\301\317\315\377\202\223\254\247\377\1\322\334\332\377" \
-  "\212\377\377\377\377\1\354\361\360\377\202\223\254\247\377\1\260\302" \
-  "\277\377\273\333\343\342\377\1\271\311\306\377\202\223\254\247\377\1" \
-  "\340\347\346\377\212\377\377\377\377\1\334\344\343\377\202\223\254\247" \
-  "\377\1\273\312\307\377\353\333\343\342\377\1\301\315\313\377\202Slg\377" \
-  "\1y\216\212\377\211\333\343\342\377\1\270\305\303\377\204Slg\377\2Tm" \
-  "h\377\317\331\327\377\212\333\343\342\377\1\202\225\221\377\202Slg\377" \
-  "\1\273\307\305\377\371\333\343\342\377\4\243\270\264\377\223\254\247" \
-  "\377\230\260\253\377\371\373\372\377\212\377\377\377\377\1\277\316\313" \
-  "\377\202\223\254\247\377\1\317\331\330\377\273\333\343\342\377\4\325" \
-  "\337\335\377\225\255\250\377\223\254\247\377\263\304\301\377\212\377" \
-  "\377\377\377\5\375\376\375\377\237\265\261\377\223\254\247\377\235\263" \
-  "\257\377\332\342\341\377\352\333\343\342\377\1\310\323\321\377\202Sl" \
-  "g\377\1k\201}\377\211\333\343\342\377\1\205\230\224\377\204Slg\377\1" \
-  "v\212\206\377\213\333\343\342\377\1t\210\204\377\202Slg\377\1\301\315" \
-  "\313\377\370\333\343\342\377\1\315\330\326\377\202\223\254\247\377\1" \
-  "\301\317\314\377\212\377\377\377\377\4\371\372\372\377\230\257\253\377" \
-  "\223\254\247\377\245\272\266\377\275\333\343\342\377\1\256\300\275\377" \
-  "\202\223\254\247\377\1\361\364\363\377\212\377\377\377\377\1\313\327" \
-  "\324\377\202\223\254\247\377\1\306\323\321\377\352\333\343\342\377\1" \
-  "\321\332\331\377\202Slg\377\2\\to\377\332\342\341\377\207\333\343\342" \
-  "\377\2\324\335\334\377Xql\377\204Slg\377\1\243\262\257\377\213\333\343" \
-  "\342\377\1czu\377\202Slg\377\1\310\323\321\377\370\333\343\342\377\1" \
-  "\257\301\276\377\202\223\254\247\377\1\356\362\361\377\212\377\377\377" \
-  "\377\1\321\333\331\377\202\223\254\247\377\1\303\321\316\377\275\333" \
-  "\343\342\377\1\314\330\326\377\202\223\254\247\377\1\304\322\317\377" \
-  "\212\377\377\377\377\4\366\370\367\377\225\255\251\377\223\254\247\377" \
-  "\250\274\270\377\353\333\343\342\377\1ayt\377\202Slg\377\1\267\303\301" \
-  "\377\207\333\343\342\377\1\241\260\255\377\204Slg\377\2Tlg\377\316\330" \
-  "\326\377\212\333\343\342\377\2\330\340\337\377Tmh\377\202Slg\377\1\325" \
-  "\336\335\377\367\333\343\342\377\4\326\337\336\377\225\256\251\377\223" \
-  "\254\247\377\257\302\276\377\213\377\377\377\377\4\243\271\264\377\223" \
-  "\254\247\377\232\262\255\377\331\342\341\377\276\333\343\342\377\4\242" \
-  "\270\263\377\223\254\247\377\232\261\255\377\373\374\374\377\212\377" \
-  "\377\377\377\1\271\311\306\377\202\223\254\247\377\1\321\333\332\377" \
-  "\352\333\343\342\377\1~\222\216\377\202Slg\377\1\177\222\217\377\206" \
-  "\333\343\342\377\2\320\332\330\377\\to\377\204Slg\377\1z\216\212\377" \
-  "\213\333\343\342\377\1\253\271\266\377\202Slg\377\1e|w\377\370\333\343" \
-  "\342\377\1\272\312\307\377\202\223\254\247\377\1\335\344\343\377\212" \
-  "\377\377\377\377\1\342\351\347\377\202\223\254\247\377\1\267\310\305" \
-  "\377\277\333\343\342\377\1\301\317\314\377\202\223\254\247\377\1\325" \
-  "\337\335\377\212\377\377\377\377\1\347\354\353\377\202\223\254\247\377" \
-  "\1\264\305\302\377\352\333\343\342\377\1\251\270\265\377\203Slg\377\2" \
-  "\220\242\236\377\331\342\341\377\203\333\343\342\377\2\320\331\330\377" \
-  "x\214\210\377\205Slg\377\1\264\300\276\377\212\333\343\342\377\2\331" \
-  "\342\341\377h~z\377\202Slg\377\1}\220\215\377\367\333\343\342\377\5\332" \
-  "\342\341\377\234\263\257\377\223\254\247\377\237\265\261\377\375\376" \
-  "\375\377\212\377\377\377\377\4\264\306\302\377\223\254\247\377\224\255" \
-  "\250\377\324\336\334\377\277\333\343\342\377\4\331\341\340\377\230\260" \
-  "\253\377\223\254\247\377\250\274\270\377\213\377\377\377\377\4\250\274" \
-  "\270\377\223\254\247\377\230\257\253\377\330\341\340\377\351\333\343" \
-  "\342\377\2\325\336\335\377[sn\377\203Slg\377\5i\177{\377\207\232\226" \
-  "\377\230\251\246\377\204\227\223\377^vq\377\205Slg\377\2e|w\377\332\342" \
-  "\341\377\212\333\343\342\377\1\232\252\247\377\203Slg\377\1\234\253\251" \
-  "\377\367\333\343\342\377\1\306\323\321\377\202\223\254\247\377\1\313" \
-  "\327\325\377\212\377\377\377\377\4\362\365\364\377\224\254\250\377\223" \
-  "\254\247\377\254\277\273\377\301\333\343\342\377\1\265\306\303\377\202" \
-  "\223\254\247\377\1\347\354\353\377\212\377\377\377\377\1\325\337\335" \
-  "\377\202\223\254\247\377\1\277\316\313\377\352\333\343\342\377\1\237" \
-  "\257\254\377\215Slg\377\1\244\262\260\377\211\333\343\342\377\2\320\332" \
-  "\330\377}\220\215\377\204Slg\377\1\301\314\312\377\367\333\343\342\377" \
-  "\4\250\274\270\377\223\254\247\377\225\256\251\377\366\370\367\377\212" \
-  "\377\377\377\377\1\306\323\321\377\202\223\254\247\377\1\312\326\324" \
-  "\377\301\333\343\342\377\1\322\334\333\377\202\223\254\247\377\1\271" \
-  "\311\306\377\212\377\377\377\377\4\373\374\374\377\233\262\255\377\223" \
-  "\254\247\377\241\267\262\377\352\333\343\342\377\2\331\342\341\377t\211" \
-  "\205\377\213Slg\377\1|\220\214\377\207\333\343\342\377\4\274\310\306" \
-  "\377\211\233\230\377n\204\200\377Voj\377\204Slg\377\2_vr\377\332\342" \
-  "\341\377\366\333\343\342\377\1\321\333\332\377\202\223\254\247\377\1" \
-  "\272\312\307\377\212\377\377\377\377\4\374\375\374\377\233\262\256\377" \
-  "\223\254\247\377\240\266\262\377\303\333\343\342\377\4\251\275\271\377" \
-  "\223\254\247\377\225\255\251\377\365\367\367\377\212\377\377\377\377" \
-  "\1\304\322\317\377\202\223\254\247\377\1\313\326\325\377\352\333\343" \
-  "\342\377\2\323\334\333\377o\204\200\377\211Slg\377\2d{v\377\321\332\331" \
-  "\377\207\333\343\342\377\1\227\250\245\377\207Slg\377\1\217\240\235\377" \
-  "\367\333\343\342\377\1\263\305\301\377\202\223\254\247\377\1\350\355" \
-  "\354\377\212\377\377\377\377\1\330\341\337\377\202\223\254\247\377\1" \
-  "\277\315\313\377\303\333\343\342\377\1\310\324\322\377\202\223\254\247" \
-  "\377\1\313\327\324\377\212\377\377\377\377\1\361\364\363\377\202\223" \
-  "\254\247\377\1\254\277\274\377\353\333\343\342\377\3\327\337\336\377" \
-  "\226\247\244\377Xql\377\205Slg\377\3Umh\377\216\240\235\377\323\334\333" \
-  "\377\210\333\343\342\377\1\227\250\245\377\207Slg\377\1\305\320\316\377" \
-  "\366\333\343\342\377\4\330\341\337\377\230\257\253\377\223\254\247\377" \
-  "\251\274\270\377\213\377\377\377\377\4\252\276\272\377\223\254\247\377" \
-  "\227\257\252\377\330\341\337\377\304\333\343\342\377\4\236\264\260\377" \
-  "\223\254\247\377\237\265\261\377\375\376\375\377\212\377\377\377\377" \
-  "\4\263\304\301\377\223\254\247\377\224\255\250\377\325\336\335\377\354" \
-  "\333\343\342\377\7\326\337\336\377\261\277\274\377\231\251\246\377\213" \
-  "\235\232\377\226\246\243\377\256\273\271\377\312\324\323\377\212\333" \
-  "\343\342\377\1\257\274\272\377\206\201\224\220\377\1\221\242\237\377" \
-  "\367\333\343\342\377\1\277\315\313\377\202\223\254\247\377\1\326\337" \
-  "\335\377\212\377\377\377\377\1\351\356\355\377\202\223\254\247\377\1" \
-  "\263\304\301\377\305\333\343\342\377\1\274\313\311\377\202\223\254\247" \
-  "\377\1\334\344\343\377\212\377\377\377\377\1\340\347\346\377\202\223" \
-  "\254\247\377\1\270\310\305\377\377\333\343\342\377\375\333\343\342\377" \
-  "\4\241\266\262\377\223\254\247\377\233\262\255\377\373\374\374\377\212" \
-  "\377\377\377\377\1\274\313\310\377\202\223\254\247\377\1\321\333\331" \
-  "\377\305\333\343\342\377\4\327\337\336\377\226\256\251\377\223\254\247" \
-  "\377\257\301\276\377\212\377\377\377\377\5\376\376\376\377\242\267\263" \
-  "\377\223\254\247\377\233\262\255\377\332\342\341\377\377\333\343\342" \
-  "\377\373\333\343\342\377\1\312\326\324\377\202\223\254\247\377\1\304" \
-  "\322\317\377\212\377\377\377\377\4\367\371\370\377\226\256\251\377\223" \
-  "\254\247\377\247\273\270\377\307\333\343\342\377\1\260\302\277\377\202" \
-  "\223\254\247\377\1\355\361\360\377\212\377\377\377\377\1\317\332\330" \
-  "\377\202\223\254\247\377\1\304\321\317\377\377\333\343\342\377\373\333" \
-  "\343\342\377\1\254\277\274\377\202\223\254\247\377\1\361\364\363\377" \
-  "\212\377\377\377\377\1\315\330\326\377\202\223\254\247\377\1\306\323" \
-  "\320\377\307\333\343\342\377\1\316\331\330\377\202\223\254\247\377\1" \
-  "\300\317\314\377\212\377\377\377\377\4\370\371\371\377\227\257\252\377" \
-  "\223\254\247\377\245\272\266\377\377\333\343\342\377\372\333\343\342" \
-  "\377\4\324\336\334\377\224\255\250\377\223\254\247\377\263\305\301\377" \
-  "\212\377\377\377\377\5\376\376\376\377\240\266\262\377\223\254\247\377" \
-  "\234\263\256\377\332\342\341\377\310\333\343\342\377\4\245\271\265\377" \
-  "\223\254\247\377\230\260\253\377\371\372\372\377\212\377\377\377\377" \
-  "\1\275\314\311\377\202\223\254\247\377\1\317\332\330\377\345\333\343" \
-  "\342\377\1\316\330\326\377\202\270\305\303\377\1\302\315\313\377\377" \
-  "\333\343\342\377\220\333\343\342\377\1\270\310\305\377\202\223\254\247" \
-  "\377\1\341\350\346\377\212\377\377\377\377\1\337\346\345\377\202\223" \
-  "\254\247\377\1\272\312\307\377\311\333\343\342\377\1\303\321\316\377" \
-  "\202\223\254\247\377\1\322\334\332\377\212\377\377\377\377\1\353\357" \
-  "\356\377\202\223\254\247\377\1\261\303\277\377\345\333\343\342\377\1" \
-  "\250\267\264\377\202Slg\377\1x\214\210\377\377\333\343\342\377\217\333" \
-  "\343\342\377\5\332\342\341\377\232\262\255\377\223\254\247\377\242\270" \
-  "\263\377\376\376\376\377\212\377\377\377\377\4\261\303\277\377\223\254" \
-  "\247\377\225\255\251\377\326\337\336\377\311\333\343\342\377\4\331\342" \
-  "\341\377\232\261\255\377\223\254\247\377\244\271\265\377\213\377\377" \
-  "\377\377\4\254\277\273\377\223\254\247\377\226\256\252\377\327\340\337" \
-  "\377\344\333\343\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377" \
-  "\377\333\343\342\377\217\333\343\342\377\1\303\321\317\377\202\223\254" \
-  "\247\377\1\317\332\330\377\212\377\377\377\377\1\357\363\362\377\202" \
-  "\223\254\247\377\1\256\301\275\377\313\333\343\342\377\1\267\310\305" \
-  "\377\202\223\254\247\377\1\343\351\350\377\212\377\377\377\377\1\331" \
-  "\342\340\377\202\223\254\247\377\1\275\314\311\377\344\333\343\342\377" \
-  "\1\250\267\264\377\202Slg\377\1x\214\210\377\377\333\343\342\377\217" \
-  "\333\343\342\377\4\245\272\266\377\223\254\247\377\227\257\252\377\370" \
-  "\372\371\377\212\377\377\377\377\1\303\321\316\377\202\223\254\247\377" \
-  "\1\315\330\326\377\313\333\343\342\377\4\324\336\334\377\224\255\250" \
-  "\377\223\254\247\377\266\307\303\377\212\377\377\377\377\4\374\375\375" \
-  "\377\235\263\257\377\223\254\247\377\236\265\260\377\344\333\343\342" \
-  "\377\1\250\267\264\377\202Slg\377\1x\214\210\377\377\333\343\342\377" \
-  "\216\333\343\342\377\1\317\332\330\377\202\223\254\247\377\1\276\315" \
-  "\312\377\212\377\377\377\377\4\372\373\373\377\231\261\254\377\223\254" \
-  "\247\377\243\270\264\377\315\333\343\342\377\4\254\277\273\377\223\254" \
-  "\247\377\224\254\250\377\363\365\365\377\212\377\377\377\377\1\310\325" \
-  "\322\377\202\223\254\247\377\1\310\324\322\377\343\333\343\342\377\1" \
-  "\250\267\264\377\202Slg\377\1r\207\203\377\232\305\320\316\377\3\306" \
-  "\320\317\377\316\327\326\377\330\340\337\377\360\333\343\342\377\1\261" \
-  "\303\277\377\202\223\254\247\377\1\353\360\357\377\212\377\377\377\377" \
-  "\1\324\336\334\377\202\223\254\247\377\1\301\317\315\377\315\333\343" \
-  "\342\377\1\312\326\324\377\202\223\254\247\377\1\307\324\321\377\212" \
-  "\377\377\377\377\4\363\366\366\377\224\255\250\377\223\254\247\377\252" \
-  "\275\272\377\343\333\343\342\377\1\250\267\264\377\240Slg\377\4[sn\377" \
-  "t\211\205\377\226\247\244\377\273\307\305\377\353\333\343\342\377\4\327" \
-  "\340\336\377\226\256\252\377\223\254\247\377\254\277\274\377\213\377" \
-  "\377\377\377\4\247\273\267\377\223\254\247\377\231\260\254\377\331\341" \
-  "\340\377\316\333\343\342\377\4\240\266\262\377\223\254\247\377\234\263" \
-  "\256\377\374\375\374\377\212\377\377\377\377\4\267\307\304\377\223\254" \
-  "\247\377\224\254\247\377\323\334\333\377\342\333\343\342\377\1\250\267" \
-  "\264\377\244Slg\377\2n\203\177\377\257\274\272\377\351\333\343\342\377" \
-  "\1\274\313\311\377\202\223\254\247\377\1\332\343\341\377\212\377\377" \
-  "\377\377\1\346\353\352\377\202\223\254\247\377\1\265\306\303\377\317" \
-  "\333\343\342\377\1\276\315\312\377\202\223\254\247\377\1\330\341\337" \
-  "\377\212\377\377\377\377\1\344\352\351\377\202\223\254\247\377\1\266" \
-  "\306\303\377\342\333\343\342\377\1\250\267\264\377\246Slg\377\2\177\222" \
-  "\217\377\324\335\334\377\347\333\343\342\377\4\236\264\260\377\223\254" \
-  "\247\377\235\264\257\377\374\375\375\377\212\377\377\377\377\1\270\310" \
-  "\305\377\202\223\254\247\377\1\323\334\333\377\317\333\343\342\377\4" \
-  "\330\340\337\377\227\257\252\377\223\254\247\377\253\276\272\377\213" \
-  "\377\377\377\377\4\245\272\266\377\223\254\247\377\231\260\254\377\331" \
-  "\341\340\377\341\333\343\342\377\1\250\267\264\377\247Slg\377\2i\200" \
-  "{\377\317\330\327\377\345\333\343\342\377\1\310\324\322\377\202\223\254" \
-  "\247\377\1\310\325\322\377\212\377\377\377\377\4\365\367\367\377\225" \
-  "\255\250\377\223\254\247\377\252\275\271\377\321\333\343\342\377\1\263" \
-  "\304\301\377\202\223\254\247\377\1\352\357\356\377\212\377\377\377\377" \
-  "\1\322\335\333\377\202\223\254\247\377\1\301\317\315\377\341\333\343" \
-  "\342\377\1\250\267\264\377\250Slg\377\2u\212\206\377\331\341\340\377" \
-  "\344\333\343\342\377\4\252\275\271\377\223\254\247\377\225\255\250\377" \
-  "\364\366\366\377\212\377\377\377\377\1\312\326\323\377\202\223\254\247" \
-  "\377\1\310\324\322\377\321\333\343\342\377\1\321\333\331\377\202\223" \
-  "\254\247\377\1\274\314\311\377\212\377\377\377\377\4\372\373\373\377" \
-  "\231\260\254\377\223\254\247\377\243\270\264\377\341\333\343\342\377" \
-  "\1\321\333\331\377\203\301\314\312\377\2\247\266\263\377[sn\377\203S" \
-  "lg\377\6r\207\203\377\216\240\235\377\247\265\263\377\264\301\277\377" \
-  "\273\307\305\377\300\314\312\377\202\301\314\312\377\7\300\314\312\377" \
-  "\273\307\305\377\265\301\277\377\250\266\264\377\220\241\236\377t\210" \
-  "\204\377Tlg\377\202Slg\377\2Zrm\377\246\264\262\377\203\301\314\312\377" \
-  "\6\274\310\306\377\266\302\300\377\254\271\267\377\223\244\241\377w\214" \
-  "\210\377Uni\377\205Slg\377\1\225\246\243\377\343\333\343\342\377\1\323" \
-  "\334\333\377\202\223\254\247\377\1\267\307\304\377\212\377\377\377\377" \
-  "\4\375\375\375\377\236\264\260\377\223\254\247\377\236\265\260\377\323" \
-  "\333\343\342\377\4\247\273\267\377\223\254\247\377\226\256\252\377\367" \
-  "\371\371\377\212\377\377\377\377\1\301\317\314\377\202\223\254\247\377" \
-  "\1\315\330\326\377\342\333\343\342\377\7\332\342\341\377\236\255\253" \
-  "\377Vni\377Slg\377Wpk\377\225\245\242\377\313\325\324\377\216\333\343" \
-  "\342\377\7\315\326\325\377\230\250\245\377Yrm\377Slg\377Uni\377\232\252" \
-  "\247\377\331\342\341\377\206\333\343\342\377\3\320\331\330\377\235\255" \
-  "\252\377[sn\377\203Slg\377\2Yql\377\321\332\331\377\342\333\343\342\377" \
-  "\1\265\306\303\377\202\223\254\247\377\1\345\353\351\377\212\377\377" \
-  "\377\377\1\333\343\342\377\202\223\254\247\377\1\274\313\311\377\323" \
-  "\333\343\342\377\1\305\322\320\377\202\223\254\247\377\1\316\331\327" \
-  "\377\212\377\377\377\377\1\356\362\361\377\202\223\254\247\377\1\256" \
-  "\301\275\377\342\333\343\342\377\1\226\246\243\377\202Slg\377\2o\205" \
-  "\201\377\313\325\324\377\222\333\343\342\377\2\316\330\326\377v\212\206" \
-  "\377\202Slg\377\1\217\241\235\377\210\333\343\342\377\2\316\330\326\377" \
-  "q\206\202\377\203Slg\377\1\230\250\245\377\341\333\343\342\377\4\331" \
-  "\341\340\377\231\260\254\377\223\254\247\377\246\272\266\377\213\377" \
-  "\377\377\377\4\256\300\275\377\223\254\247\377\226\256\252\377\327\340" \
-  "\336\377\323\333\343\342\377\5\332\342\341\377\234\263\256\377\223\254" \
-  "\247\377\241\267\262\377\376\376\376\377\212\377\377\377\377\4\260\302" \
-  "\276\377\223\254\247\377\225\255\251\377\326\337\336\377\340\333\343" \
-  "\342\377\1\262\277\275\377\202Slg\377\2q\207\202\377\325\335\334\377" \
-  "\224\333\343\342\377\2\327\337\336\377v\212\206\377\202Slg\377\1\254" \
-  "\272\270\377\210\333\343\342\377\2\321\333\331\377g}y\377\202Slg\377" \
-  "\1i\177{\377\341\333\343\342\377\1\301\317\314\377\202\223\254\247\377" \
-  "\1\323\335\333\377\212\377\377\377\377\1\354\361\360\377\202\223\254" \
-  "\247\377\1\261\303\277\377\325\333\343\342\377\1\272\311\307\377\202" \
-  "\223\254\247\377\1\337\346\345\377\212\377\377\377\377\1\335\345\344" \
-  "\377\202\223\254\247\377\1\272\312\307\377\337\333\343\342\377\5\327" \
-  "\337\336\377]up\377Slg\377Voj\377\306\320\317\377\226\333\343\342\377" \
-  "\5\312\324\323\377Xpk\377Slg\377Yrm\377\324\335\334\377\210\333\343\342" \
-  "\377\1\261\277\274\377\203Slg\377\1\317\331\327\377\340\333\343\342\377" \
-  "\4\243\270\264\377\223\254\247\377\231\260\254\377\372\373\373\377\212" \
-  "\377\377\377\377\1\277\316\313\377\202\223\254\247\377\1\317\332\330" \
-  "\377\325\333\343\342\377\4\325\337\335\377\225\255\251\377\223\254\247" \
-  "\377\261\303\300\377\212\377\377\377\377\5\376\376\376\377\240\266\261" \
-  "\377\223\254\247\377\234\263\257\377\332\342\341\377\336\333\343\342" \
-  "\377\1\254\272\270\377\202Slg\377\1\201\224\220\377\230\333\343\342\377" \
-  "\1\206\230\225\377\202Slg\377\1\246\265\262\377\211\333\343\342\377\1" \
-  "g}y\377\202Slg\377\1\257\274\272\377\337\333\343\342\377\1\314\330\326" \
-  "\377\202\223\254\247\377\1\302\320\315\377\212\377\377\377\377\4\371" \
-  "\372\372\377\230\257\253\377\223\254\247\377\245\272\266\377\327\333" \
-  "\343\342\377\1\256\301\275\377\202\223\254\247\377\1\360\363\362\377" \
-  "\212\377\377\377\377\1\314\327\325\377\202\223\254\247\377\1\306\323" \
-  "\320\377\336\333\343\342\377\1x\215\211\377\202Slg\377\1\254\272\270" \
-  "\377\230\333\343\342\377\1\257\274\272\377\202Slg\377\1r\207\203\377" \
-  "\211\333\343\342\377\1\214\235\232\377\202Slg\377\1\237\257\254\377\337" \
-  "\333\343\342\377\1\256\301\275\377\202\223\254\247\377\1\357\362\362" \
-  "\377\212\377\377\377\377\1\321\333\331\377\202\223\254\247\377\1\303" \
-  "\321\317\377\327\333\343\342\377\1\314\330\326\377\202\223\254\247\377" \
-  "\1\303\321\316\377\212\377\377\377\377\4\366\370\370\377\225\256\251" \
-  "\377\223\254\247\377\247\273\270\377\336\333\343\342\377\1\\so\377\202" \
-  "Slg\377\1\277\313\311\377\230\333\343\342\377\1\301\315\313\377\202S" \
-  "lg\377\2Vni\377\332\342\341\377\210\333\343\342\377\1\244\263\260\377" \
-  "\202Slg\377\1\226\246\243\377\336\333\343\342\377\4\325\337\335\377\225" \
-  "\255\251\377\223\254\247\377\260\302\277\377\213\377\377\377\377\4\243" \
-  "\271\264\377\223\254\247\377\232\262\255\377\332\342\341\377\330\333" \
-  "\343\342\377\4\243\270\264\377\223\254\247\377\232\261\254\377\373\374" \
-  "\373\377\212\377\377\377\377\1\272\312\307\377\202\223\254\247\377\1" \
-  "\321\333\332\377\334\333\343\342\377\1\326\336\335\377\203Slg\377\1\311" \
-  "\324\322\377\230\333\343\342\377\1\314\325\324\377\203Slg\377\1\317\331" \
-  "\327\377\210\333\343\342\377\1\256\274\271\377\202Slg\377\1\215\236\233" \
-  "\377\336\333\343\342\377\1\272\311\307\377\202\223\254\247\377\1\336" \
-  "\345\344\377\212\377\377\377\377\1\342\351\347\377\202\223\254\247\377" \
-  "\1\270\310\305\377\331\333\343\342\377\1\301\317\314\377\202\223\254" \
-  "\247\377\1\325\336\334\377\212\377\377\377\377\1\350\355\354\377\202" \
-  "\223\254\247\377\1\263\304\301\377\334\333\343\342\377\1\307\322\320" \
-  "\377\203Slg\377\1\276\311\307\377\230\333\343\342\377\1\302\315\313\377" \
-  "\203Slg\377\1\301\314\312\377\210\333\343\342\377\1\261\276\274\377\202" \
-  "Slg\377\1\215\237\234\377\335\333\343\342\377\5\332\342\341\377\234\263" \
-  "\256\377\223\254\247\377\240\266\262\377\376\376\376\377\212\377\377" \
-  "\377\377\4\265\306\302\377\223\254\247\377\224\255\250\377\324\336\334" \
-  "\377\331\333\343\342\377\6\331\341\340\377\231\260\254\377\222\253\247" \
-  "\377\237\265\261\377\351\356\355\377\370\371\371\377\211\377\377\377" \
-  "\377\4\251\275\271\377\223\254\247\377\227\257\252\377\330\341\337\377" \
-  "\333\333\343\342\377\1\303\316\314\377\203Slg\377\1\251\267\265\377\230" \
-  "\333\343\342\377\1\257\274\272\377\203Slg\377\1\275\310\306\377\210\333" \
-  "\343\342\377\1\243\262\257\377\202Slg\377\1\224\245\242\377\335\333\343" \
-  "\342\377\1\305\322\320\377\202\223\254\247\377\1\315\330\326\377\212" \
-  "\377\377\377\377\4\362\365\364\377\224\254\250\377\223\254\247\377\254" \
-  "\277\274\377\333\333\343\342\377\2\265\306\303\377\222\254\246\377\203" \
-  "\223\254\247\377\7\233\262\255\377\252\276\272\377\271\311\306\377\310" \
-  "\325\322\377\330\341\337\377\347\354\353\377\366\370\370\377\202\377" \
-  "\377\377\377\1\327\340\336\377\202\223\254\247\377\1\277\315\313\377" \
-  "\333\333\343\342\377\1\321\332\331\377\203Slg\377\1|\220\214\377\230" \
-  "\333\343\342\377\1\200\223\220\377\203Slg\377\1\313\325\323\377\210\333" \
-  "\343\342\377\1\225\245\242\377\202Slg\377\1\234\253\251\377\335\333\343" \
-  "\342\377\4\247\273\267\377\223\254\247\377\226\256\251\377\366\370\370" \
-  "\377\212\377\377\377\377\1\306\323\321\377\202\223\254\247\377\1\312" \
-  "\326\324\377\333\333\343\342\377\1\322\334\333\377\202\223\254\247\377" \
-  "\5\245\271\266\377\307\324\321\377\267\310\304\377\247\274\270\377\230" \
-  "\260\253\377\204\223\254\247\377\6\231\261\254\377\250\274\270\377\266" \
-  "\306\303\377\226\256\251\377\222\254\247\377\236\265\261\377\334\333" \
-  "\343\342\377\1Woj\377\202Slg\377\2Umh\377\277\312\310\377\226\333\343" \
-  "\342\377\2\300\314\312\377Uni\377\202Slg\377\2Tlg\377\330\340\337\377" \
-  "\210\333\343\342\377\1\177\223\217\377\202Slg\377\1\252\270\266\377\334" \
-  "\333\343\342\377\1\321\333\331\377\202\223\254\247\377\1\273\312\307" \
-  "\377\212\377\377\377\377\4\374\375\374\377\233\262\256\377\223\254\247" \
-  "\377\241\266\262\377\335\333\343\342\377\4\245\271\265\377\223\254\247" \
-  "\377\224\254\247\377\365\367\367\377\203\377\377\377\377\7\365\367\367" \
-  "\377\345\353\352\377\325\337\335\377\306\323\320\377\267\307\304\377" \
-  "\247\273\267\377\230\260\253\377\202\223\254\247\377\2\222\253\247\377" \
-  "\312\326\324\377\333\333\343\342\377\1y\215\211\377\203Slg\377\2f}x\377" \
-  "\316\330\326\377\224\333\343\342\377\2\317\330\327\377g~y\377\203Slg" \
-  "\377\1s\210\204\377\210\333\343\342\377\2\316\327\326\377Vni\377\202" \
-  "Slg\377\1\276\311\307\377\334\333\343\342\377\1\263\304\301\377\202\223" \
-  "\254\247\377\1\350\356\355\377\212\377\377\377\377\1\330\341\337\377" \
-  "\202\223\254\247\377\1\277\315\313\377\335\333\343\342\377\1\310\324" \
-  "\322\377\202\222\254\247\377\1\310\325\323\377\212\377\377\377\377\4" \
-  "\347\355\354\377\223\253\246\377\222\253\246\377\250\274\267\377\202" \
-  "\333\343\342\377\2\306\323\321\377\331\340\337\377\327\333\343\342\377" \
-  "\1\250\266\264\377\204Slg\377\2ayt\377\274\310\306\377\222\333\343\342" \
-  "\377\2\275\310\306\377czu\377\204Slg\377\1\243\262\257\377\210\333\343" \
-  "\342\377\1\223\244\241\377\203Slg\377\1\321\333\331\377\333\333\343\342" \
-  "\377\4\330\340\337\377\227\257\252\377\223\254\247\377\251\275\271\377" \
-  "\213\377\377\377\377\4\252\276\272\377\223\254\247\377\230\257\253\377" \
-  "\330\341\337\377\336\333\343\342\377\4\232\261\254\377\223\254\247\377" \
-  "\232\260\254\377\375\375\375\377\212\377\377\377\377\7\256\301\274\377" \
-  "\223\254\247\377\223\253\247\377\311\325\323\377\234\264\256\377\223" \
-  "\254\247\377\277\316\313\377\327\333\343\342\377\2\323\334\333\377^u" \
-  "q\377\205Slg\377\3}\221\215\377\270\305\303\377\330\340\337\377\214\333" \
-  "\343\342\377\3\330\340\337\377\270\304\302\377}\220\215\377\205Slg\377" \
-  "\2]tp\377\321\332\331\377\207\333\343\342\377\2\237\256\253\377Tlg\377" \
-  "\202Slg\377\1h~z\377\334\333\343\342\377\1\276\315\312\377\202\223\254" \
-  "\247\377\1\327\340\336\377\212\377\377\377\377\1\351\356\355\377\202" \
-  "\223\254\247\377\1\263\305\301\377\337\333\343\342\377\4\272\312\310" \
-  "\377\223\253\247\377\222\253\246\377\333\343\342\377\212\377\377\377" \
-  "\377\7\341\350\347\377\222\254\246\377\223\253\247\377\264\305\302\377" \
-  "\230\257\253\377\223\254\247\377\241\267\263\377\330\333\343\342\377" \
-  "\1\251\270\265\377\207Slg\377\6Yrm\377z\216\212\377\220\242\236\377\245" \
-  "\264\261\377\263\300\276\377\270\305\303\377\202\276\312\310\377\6\271" \
-  "\305\303\377\263\300\276\377\246\264\262\377\220\242\236\377y\216\212" \
-  "\377Yql\377\207Slg\377\1\250\267\264\377\205\333\343\342\377\3\331\342" \
-  "\341\377\271\306\304\377\204\226\223\377\204Slg\377\1\212\234\231\377" \
-  "\334\333\343\342\377\4\240\266\262\377\223\254\247\377\233\262\256\377" \
-  "\374\374\374\377\212\377\377\377\377\1\274\313\310\377\202\223\254\247" \
-  "\377\1\321\333\332\377\337\333\343\342\377\4\327\340\336\377\224\254" \
-  "\250\377\223\254\247\377\250\273\267\377\212\377\377\377\377\5\376\376" \
-  "\376\377\236\264\257\377\223\254\247\377\227\257\252\377\263\304\302" \
-  "\377\202\223\254\247\377\1\313\327\325\377\330\333\343\342\377\1}\221" \
-  "\215\377\232Slg\377\1~\222\216\377\205\333\343\342\377\2\325\336\335" \
-  "\377`xs\377\206Slg\377\1\256\274\271\377\333\333\343\342\377\1\312\326" \
-  "\324\377\202\223\254\247\377\1\306\323\320\377\212\377\377\377\377\4" \
-  "\367\371\370\377\226\256\251\377\223\254\247\377\247\273\270\377\341" \
-  "\333\343\342\377\4\255\277\274\377\223\253\246\377\222\253\246\377\354" \
-  "\361\360\377\212\377\377\377\377\4\317\332\330\377\222\253\246\377\223" \
-  "\253\246\377\274\314\311\377\202\223\254\247\377\1\254\277\274\377\330" \
-  "\333\343\342\377\2\327\340\337\377}\221\215\377\230Slg\377\2}\221\215" \
-  "\377\330\340\337\377\205\333\343\342\377\1\323\334\333\377\206Slg\377" \
-  "\2[sn\377\327\337\336\377\333\333\343\342\377\4\254\277\273\377\223\254" \
-  "\247\377\224\254\250\377\362\365\364\377\212\377\377\377\377\1\315\330" \
-  "\326\377\202\223\254\247\377\1\306\323\321\377\341\333\343\342\377\4" \
-  "\317\331\330\377\222\253\247\377\223\253\246\377\273\313\310\377\212" \
-  "\377\377\377\377\10\370\372\371\377\225\255\251\377\223\254\247\377\240" \
-  "\266\262\377\251\274\271\377\223\254\247\377\225\255\250\377\324\336" \
-  "\335\377\330\333\343\342\377\2\330\341\340\377\213\235\232\377\226Sl" \
-  "g\377\2\211\234\230\377\330\340\337\377\206\333\343\342\377\1\323\334" \
-  "\333\377\206Slg\377\1\212\234\231\377\333\333\343\342\377\4\324\336\334" \
-  "\377\224\255\250\377\223\254\247\377\264\305\302\377\212\377\377\377" \
-  "\377\5\376\376\376\377\240\266\262\377\223\254\247\377\234\263\257\377" \
-  "\332\342\341\377\342\333\343\342\377\4\240\266\262\377\223\254\247\377" \
-  "\225\255\250\377\371\372\372\377\203\377\377\377\377\3\367\371\371\377" \
-  "\300\317\314\377\273\313\307\377\204\377\377\377\377\4\271\312\306\377" \
-  "\223\254\246\377\223\254\247\377\276\314\311\377\202\223\254\247\377" \
-  "\1\271\311\305\377\332\333\343\342\377\2\270\304\302\377e|w\377\222S" \
-  "lg\377\2d{v\377\267\303\301\377\211\333\343\342\377\206\322\333\332\377" \
-  "\1\327\340\337\377\333\333\343\342\377\1\267\310\305\377\202\223\254" \
-  "\247\377\1\342\350\347\377\212\377\377\377\377\1\337\346\345\377\202" \
-  "\223\254\247\377\1\272\312\307\377\343\333\343\342\377\4\303\321\317" \
-  "\377\222\254\247\377\223\254\246\377\320\332\330\377\203\377\377\377" \
-  "\377\4\373\374\374\377\233\262\255\377\224\255\250\377\363\366\365\377" \
-  "\203\377\377\377\377\10\354\360\357\377\222\253\246\377\222\254\247\377" \
-  "\255\300\274\377\233\262\255\377\223\254\247\377\233\262\255\377\332" \
-  "\342\341\377\332\333\343\342\377\3\327\337\336\377\251\270\265\377q\207" \
-  "\202\377\216Slg\377\3q\206\202\377\251\267\265\377\326\337\336\377\353" \
-  "\333\343\342\377\5\331\342\341\377\232\261\255\377\223\254\247\377\243" \
-  "\270\264\377\376\376\376\377\212\377\377\377\377\4\261\303\277\377\223" \
-  "\254\247\377\225\255\251\377\326\337\336\377\343\333\343\342\377\4\332" \
-  "\342\341\377\227\257\252\377\223\254\247\377\235\264\257\377\204\377" \
-  "\377\377\377\3\304\321\317\377\223\254\247\377\307\324\321\377\204\377" \
-  "\377\377\377\4\246\273\267\377\223\254\247\377\222\253\247\377\222\253" \
-  "\246\377\202\223\254\247\377\1\304\321\317\377\335\333\343\342\377\6" \
-  "\306\321\317\377\247\265\263\377\212\234\231\377o\205\201\377dzv\377" \
-  "[sn\377\202Tlg\377\6[sn\377dzv\377o\205\201\377\212\234\231\377\247\265" \
-  "\263\377\306\320\317\377\356\333\343\342\377\1\303\320\316\377\202\223" \
-  "\254\247\377\1\320\333\331\377\212\377\377\377\377\1\357\363\362\377" \
-  "\202\223\254\247\377\1\256\301\275\377\345\333\343\342\377\4\265\306" \
-  "\303\377\223\254\247\377\222\254\246\377\342\351\347\377\203\377\377" \
-  "\377\377\4\361\364\363\377\224\255\250\377\234\263\257\377\374\375\375" \
-  "\377\203\377\377\377\377\4\333\343\341\377\223\253\246\377\222\254\246" \
-  "\377\221\254\246\377\202\223\254\247\377\1\246\272\266\377\343\333\343" \
-  "\342\377\2\332\342\341\377\331\342\341\377\364\333\343\342\377\4\245" \
-  "\271\265\377\223\254\247\377\230\257\253\377\371\372\372\377\212\377" \
-  "\377\377\377\1\303\321\316\377\202\223\254\247\377\1\315\330\326\377" \
-  "\345\333\343\342\377\4\324\336\334\377\223\253\247\377\223\254\247\377" \
-  "\257\302\275\377\204\377\377\377\377\3\262\304\301\377\223\254\247\377" \
-  "\330\341\337\377\203\377\377\377\377\5\375\375\375\377\231\260\253\377" \
-  "\223\254\247\377\230\260\253\377\257\301\276\377\202\223\254\247\377" \
-  "\1\317\332\330\377\377\333\343\342\377\330\333\343\342\377\1\316\331" \
-  "\330\377\202\223\254\247\377\1\277\316\313\377\212\377\377\377\377\4" \
-  "\372\373\373\377\232\261\254\377\223\254\247\377\243\270\264\377\347" \
-  "\333\343\342\377\4\247\273\270\377\222\253\246\377\223\253\247\377\362" \
-  "\365\364\377\203\377\377\377\377\3\340\347\345\377\223\254\247\377\253" \
-  "\276\272\377\204\377\377\377\377\4\307\323\321\377\223\253\247\377\223" \
-  "\253\246\377\276\314\312\377\202\223\254\247\377\1\261\303\300\377\377" \
-  "\333\343\342\377\330\333\343\342\377\1\260\302\277\377\202\223\254\247" \
-  "\377\1\354\361\360\377\212\377\377\377\377\1\324\336\334\377\202\223" \
-  "\254\247\377\1\301\317\315\377\347\333\343\342\377\1\312\326\324\377" \
-  "\202\223\253\246\377\1\302\321\316\377\204\377\377\377\377\3\242\267" \
-  "\263\377\223\254\247\377\351\356\355\377\203\377\377\377\377\10\364\367" \
-  "\366\377\223\253\247\377\223\254\247\377\245\271\266\377\243\270\264" \
-  "\377\223\254\247\377\227\257\252\377\327\340\337\377\377\333\343\342" \
-  "\377\326\333\343\342\377\4\327\337\336\377\226\256\251\377\223\254\247" \
-  "\377\256\300\275\377\213\377\377\377\377\4\247\273\267\377\223\254\247" \
-  "\377\231\260\254\377\331\341\340\377\350\333\343\342\377\4\234\262\256" \
-  "\377\223\254\247\377\227\257\252\377\374\374\374\377\203\377\377\377" \
-  "\377\3\316\332\327\377\223\254\247\377\274\314\310\377\204\377\377\377" \
-  "\377\4\261\304\300\377\222\253\246\377\222\254\247\377\274\313\311\377" \
-  "\202\223\254\247\377\1\275\314\311\377\356\333\343\342\377\1\277\313" \
-  "\311\377\202\260\275\273\377\1\311\323\322\377\343\333\343\342\377\1" \
-  "\274\313\310\377\202\223\254\247\377\1\333\343\342\377\212\377\377\377" \
-  "\377\1\346\353\352\377\202\223\254\247\377\1\266\306\303\377\351\333" \
-  "\343\342\377\4\276\314\312\377\223\254\246\377\222\253\246\377\330\341" \
-  "\337\377\203\377\377\377\377\4\370\371\371\377\227\257\252\377\226\257" \
-  "\252\377\367\371\370\377\203\377\377\377\377\7\345\353\352\377\223\254" \
-  "\246\377\223\253\246\377\261\303\301\377\231\261\254\377\223\254\247" \
-  "\377\236\265\261\377\356\333\343\342\377\1\202\225\221\377\202Slg\377" \
-  "\1\243\262\257\377\343\333\343\342\377\4\236\264\260\377\223\254\247" \
-  "\377\236\264\260\377\375\375\375\377\212\377\377\377\377\4\270\310\305" \
-  "\377\223\254\247\377\224\254\247\377\323\335\333\377\351\333\343\342" \
-  "\377\4\330\341\337\377\224\255\251\377\223\254\247\377\244\271\264\377" \
-  "\204\377\377\377\377\3\275\314\311\377\223\254\247\377\315\331\326\377" \
-  "\204\377\377\377\377\7\240\266\262\377\223\254\247\377\226\255\251\377" \
-  "\265\306\302\377\225\255\250\377\255\277\274\377\327\340\337\377\355" \
-  "\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\342\333" \
-  "\343\342\377\1\307\324\322\377\202\223\254\247\377\1\312\326\323\377" \
-  "\212\377\377\377\377\4\365\367\367\377\225\255\250\377\223\254\247\377" \
-  "\252\275\272\377\353\333\343\342\377\4\260\301\276\377\223\253\246\377" \
-  "\222\253\247\377\351\356\355\377\203\377\377\377\377\4\352\357\356\377" \
-  "\223\254\247\377\241\266\262\377\376\376\376\377\203\377\377\377\377" \
-  "\1\323\335\333\377\202\223\254\246\377\2\275\314\311\377\324\336\334" \
-  "\377\357\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\342\333\343\342\377\4\251\275\271\377\223\254\247\377\225\255\250\377" \
-  "\364\367\366\377\212\377\377\377\377\1\312\326\323\377\202\223\254\247" \
-  "\377\1\310\324\322\377\353\333\343\342\377\4\321\333\331\377\223\254" \
-  "\246\377\222\254\246\377\266\307\304\377\204\377\377\377\377\3\253\277" \
-  "\273\377\223\254\247\377\336\346\344\377\203\377\377\377\377\4\372\373" \
-  "\373\377\226\257\251\377\223\254\247\377\236\264\260\377\360\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\341\333\343\342" \
-  "\377\1\322\334\333\377\202\223\254\247\377\1\270\310\305\377\212\377" \
-  "\377\377\377\4\375\375\375\377\236\264\260\377\223\254\247\377\236\265" \
-  "\260\377\355\333\343\342\377\4\243\270\264\377\223\254\247\377\224\255" \
-  "\247\377\366\370\370\377\203\377\377\377\377\3\331\342\340\377\223\254" \
-  "\247\377\261\303\300\377\204\377\377\377\377\4\276\314\312\377\223\253" \
-  "\246\377\223\253\247\377\314\330\326\377\331\333\343\342\377\6\331\341" \
-  "\340\377\306\320\317\377\256\273\271\377\237\257\254\377\230\250\245" \
-  "\377\220\242\236\377\220\216\237\234\377\1g~y\377\202Slg\377\1\243\262" \
-  "\257\377\341\333\343\342\377\1\265\306\302\377\202\223\254\247\377\1" \
-  "\346\353\352\377\212\377\377\377\377\1\333\343\342\377\202\223\254\247" \
-  "\377\1\275\314\311\377\355\333\343\342\377\4\306\323\320\377\222\253" \
-  "\246\377\223\254\246\377\313\327\325\377\203\377\377\377\377\4\374\375" \
-  "\375\377\234\263\257\377\223\254\247\377\357\363\362\377\203\377\377" \
-  "\377\377\4\357\363\362\377\223\254\247\377\223\253\246\377\253\275\272" \
-  "\377\327\333\343\342\377\3\271\306\304\377\205\230\224\377Yrm\377\230" \
-  "Slg\377\1\243\262\257\377\340\333\343\342\377\4\331\341\340\377\230\260" \
-  "\253\377\223\254\247\377\247\273\267\377\213\377\377\377\377\4\256\300" \
-  "\275\377\223\254\247\377\226\256\252\377\327\340\337\377\355\333\343" \
-  "\342\377\5\332\342\341\377\230\260\254\377\223\254\247\377\233\262\255" \
-  "\377\376\376\376\377\203\377\377\377\377\3\307\324\321\377\223\254\247" \
-  "\377\302\320\315\377\204\377\377\377\377\1\245\272\265\377\202\223\254" \
-  "\247\377\1\325\337\335\377\324\333\343\342\377\2\317\330\327\377\200" \
-  "\224\220\377\233Slg\377\1\243\262\257\377\340\333\343\342\377\1\300\316" \
-  "\314\377\202\223\254\247\377\1\324\336\334\377\212\377\377\377\377\1" \
-  "\354\361\360\377\202\223\254\247\377\1\261\303\277\377\357\333\343\342" \
-  "\377\1\270\311\306\377\202\222\254\247\377\1\336\346\344\377\203\377" \
-  "\377\377\377\13\363\366\365\377\224\255\250\377\231\261\254\377\372\373" \
-  "\373\377\374\375\375\377\330\341\337\377\252\276\272\377\223\254\247" \
-  "\377\222\254\246\377\223\253\247\377\271\311\306\377\323\333\343\342" \
-  "\377\2\320\331\330\377h\177z\377\234Slg\377\1\243\262\257\377\340\333" \
-  "\343\342\377\4\242\267\263\377\223\254\247\377\232\261\254\377\372\373" \
-  "\373\377\212\377\377\377\377\1\277\316\313\377\202\223\254\247\377\1" \
-  "\317\332\330\377\357\333\343\342\377\4\326\337\336\377\224\254\247\377" \
-  "\223\254\247\377\252\276\272\377\204\377\377\377\377\13\266\307\303\377" \
-  "\223\254\247\377\260\302\276\377\233\263\256\377\223\254\247\377\234" \
-  "\263\257\377\306\323\320\377\236\265\260\377\223\254\247\377\234\263" \
-  "\256\377\332\342\341\377\322\333\343\342\377\1x\214\210\377\235Slg\377" \
-  "\1\243\262\257\377\337\333\343\342\377\1\314\327\325\377\202\223\254" \
-  "\247\377\1\303\321\316\377\212\377\377\377\377\4\371\372\372\377\230" \
-  "\257\253\377\223\254\247\377\245\272\266\377\361\333\343\342\377\4\252" \
-  "\276\272\377\222\254\246\377\223\253\246\377\357\362\362\377\202\377" \
-  "\377\377\377\11\341\350\346\377\253\276\273\377\223\253\247\377\223\254" \
-  "\246\377\253\276\272\377\330\341\340\377\374\375\375\377\377\377\377" \
-  "\377\315\330\326\377\202\223\254\247\377\1\305\322\320\377\321\333\343" \
-  "\342\377\1\267\304\302\377\212Slg\377\3Xpk\377byt\377k\201|\377\216l" \
-  "\201}\377\1[sn\377\202Slg\377\1\243\262\257\377\337\333\343\342\377\1" \
-  "\256\300\275\377\202\223\254\247\377\1\357\363\362\377\212\377\377\377" \
-  "\377\1\321\333\331\377\202\223\254\247\377\1\304\321\317\377\361\333" \
-  "\343\342\377\12\315\330\326\377\222\254\246\377\222\254\247\377\272\312" \
-  "\307\377\317\332\330\377\242\270\263\377\223\254\247\377\227\257\252" \
-  "\377\275\314\311\377\352\357\356\377\204\377\377\377\377\4\366\370\370" \
-  "\377\226\256\251\377\223\254\247\377\247\273\267\377\321\333\343\342" \
-  "\377\1\204\226\223\377\205Slg\377\5]up\377\212\234\231\377\270\305\303" \
-  "\377\315\326\325\377\327\337\336\377\221\333\343\342\377\1\202\225\221" \
-  "\377\202Slg\377\1\243\262\257\377\336\333\343\342\377\4\325\336\335\377" \
-  "\225\255\250\377\223\254\247\377\261\303\300\377\213\377\377\377\377" \
-  "\4\243\271\264\377\223\254\247\377\233\262\255\377\332\342\341\377\362" \
-  "\333\343\342\377\7\236\264\261\377\223\254\247\377\222\253\246\377\223" \
-  "\254\247\377\241\267\263\377\316\331\327\377\367\371\371\377\207\377" \
-  "\377\377\377\1\274\313\310\377\202\223\254\247\377\1\320\333\331\377" \
-  "\320\333\343\342\377\1`ws\377\204Slg\377\2\220\241\236\377\330\341\340" \
-  "\377\225\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\336\333\343\342\377\1\271\311\306\377\202\223\254\247\377\1\337\346" \
-  "\345\377\212\377\377\377\377\1\342\351\347\377\202\223\254\247\377\1" \
-  "\270\310\305\377\363\333\343\342\377\5\301\317\315\377\222\253\246\377" \
-  "\223\253\247\377\300\317\314\377\376\376\376\377\211\377\377\377\377" \
-  "\1\351\356\355\377\202\223\254\247\377\1\262\304\301\377\317\333\343" \
-  "\342\377\1\322\333\332\377\204Slg\377\2{\217\213\377\331\342\341\377" \
-  "\226\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\335" \
-  "\333\343\342\377\5\332\342\341\377\234\262\256\377\223\254\247\377\241" \
-  "\267\262\377\376\376\376\377\212\377\377\377\377\4\265\306\302\377\223" \
-  "\254\247\377\224\255\250\377\324\336\334\377\363\333\343\342\377\4\331" \
-  "\341\340\377\231\260\254\377\223\254\247\377\246\272\266\377\213\377" \
-  "\377\377\377\4\252\275\271\377\223\254\247\377\227\257\252\377\330\340" \
-  "\337\377\316\333\343\342\377\1\307\321\320\377\204Slg\377\1\311\323\322" \
-  "\377\227\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377" \
-  "\335\333\343\342\377\1\305\322\320\377\202\223\254\247\377\1\315\331" \
-  "\326\377\212\377\377\377\377\4\362\365\364\377\224\254\250\377\223\254" \
-  "\247\377\254\277\274\377\365\333\343\342\377\1\266\306\303\377\202\223" \
-  "\254\247\377\1\345\353\352\377\212\377\377\377\377\1\330\341\337\377" \
-  "\202\223\254\247\377\1\276\315\312\377\316\333\343\342\377\1\303\316" \
-  "\314\377\203Slg\377\2Zrm\377\332\342\341\377\227\333\343\342\377\1\267" \
-  "\303\301\377\202\243\262\257\377\1\304\316\315\377\335\333\343\342\377" \
-  "\4\247\273\267\377\223\254\247\377\226\256\252\377\367\371\370\377\212" \
-  "\377\377\377\377\1\306\323\321\377\202\223\254\247\377\1\313\326\325" \
-  "\377\365\333\343\342\377\1\323\334\333\377\202\223\254\247\377\1\267" \
-  "\310\305\377\212\377\377\377\377\4\374\374\374\377\233\262\256\377\223" \
-  "\254\247\377\240\266\261\377\316\333\343\342\377\1\322\333\332\377\203" \
-  "Slg\377\1q\207\202\377\370\333\343\342\377\1\320\333\331\377\202\223" \
-  "\254\247\377\1\274\313\310\377\212\377\377\377\377\4\374\375\374\377" \
-  "\234\263\256\377\223\254\247\377\241\266\262\377\367\333\343\342\377" \
-  "\4\252\275\271\377\223\254\247\377\225\255\250\377\364\366\366\377\212" \
-  "\377\377\377\377\1\306\323\321\377\202\223\254\247\377\1\312\326\324" \
-  "\377\316\333\343\342\377\1[sn\377\202Slg\377\1{\217\213\377\370\333\343" \
-  "\342\377\1\262\304\300\377\202\223\254\247\377\1\351\356\355\377\212" \
-  "\377\377\377\377\1\330\341\337\377\202\223\254\247\377\1\277\316\313" \
-  "\377\367\333\343\342\377\1\310\324\322\377\202\223\254\247\377\1\311" \
-  "\325\323\377\212\377\377\377\377\4\362\365\364\377\224\254\250\377\223" \
-  "\254\247\377\253\276\273\377\316\333\343\342\377\1y\215\211\377\202S" \
-  "lg\377\1o\204\200\377\367\333\343\342\377\4\330\340\337\377\227\257\252" \
-  "\377\223\254\247\377\253\276\272\377\213\377\377\377\377\4\252\276\272" \
-  "\377\223\254\247\377\230\257\253\377\330\341\337\377\370\333\343\342" \
-  "\377\4\236\265\260\377\223\254\247\377\236\264\257\377\375\375\375\377" \
-  "\212\377\377\377\377\4\265\306\302\377\223\254\247\377\224\255\250\377" \
-  "\324\335\334\377\315\333\343\342\377\1\270\304\302\377\202Slg\377\2U" \
-  "ni\377\320\332\330\377\366\333\343\342\377\1\276\315\312\377\202\223" \
-  "\254\247\377\1\330\341\337\377\212\377\377\377\377\1\351\356\355\377" \
-  "\202\223\254\247\377\1\264\305\302\377\371\333\343\342\377\1\275\314" \
-  "\311\377\202\223\254\247\377\1\333\343\341\377\212\377\377\377\377\1" \
-  "\342\351\347\377\202\223\254\247\377\1\267\307\304\377\316\333\343\342" \
-  "\377\1q\206\202\377\202Slg\377\1\233\253\250\377\227\333\343\342\377" \
-  "\1\205\230\224\377\202Voj\377\1\244\263\260\377\333\333\343\342\377\4" \
-  "\237\265\261\377\223\254\247\377\234\263\256\377\374\375\374\377\212" \
-  "\377\377\377\377\1\274\313\310\377\202\223\254\247\377\1\321\333\332" \
-  "\377\371\333\343\342\377\4\327\340\336\377\226\256\252\377\223\254\247" \
-  "\377\255\300\274\377\213\377\377\377\377\4\243\271\264\377\223\254\247" \
-  "\377\232\261\255\377\331\342\341\377\315\333\343\342\377\5\313\325\323" \
-  "\377ayt\377Slg\377Xpk\377\305\317\316\377\226\333\343\342\377\1\202\225" \
-  "\221\377\202Slg\377\1\243\262\257\377\332\333\343\342\377\1\311\325\323" \
-  "\377\202\223\254\247\377\1\310\325\322\377\212\377\377\377\377\4\367" \
-  "\371\370\377\226\256\251\377\223\254\247\377\250\274\270\377\373\333" \
-  "\343\342\377\1\261\303\277\377\202\223\254\247\377\1\356\361\361\377" \
-  "\212\377\377\377\377\1\322\334\332\377\202\223\254\247\377\1\303\320" \
-  "\316\377\316\333\343\342\377\5\305\317\316\377]up\377Slg\377^vq\377\275" \
-  "\311\307\377\225\333\343\342\377\1\202\225\221\377\202Slg\377\1\243\262" \
-  "\257\377\332\333\343\342\377\4\253\276\273\377\223\254\247\377\224\255" \
-  "\250\377\363\366\366\377\212\377\377\377\377\1\315\330\326\377\202\223" \
-  "\254\247\377\1\306\323\321\377\373\333\343\342\377\1\317\332\330\377" \
-  "\202\223\254\247\377\1\300\317\314\377\212\377\377\377\377\4\371\373" \
-  "\372\377\230\260\253\377\223\254\247\377\244\271\265\377\317\333\343" \
-  "\342\377\6\314\325\324\377}\221\215\377Slg\377Tlg\377\206\230\225\377" \
-  "\277\312\310\377\223\333\343\342\377\1\202\225\221\377\202Slg\377\1\243" \
-  "\262\257\377\331\333\343\342\377\4\323\335\334\377\224\255\250\377\223" \
-  "\254\247\377\267\307\304\377\212\377\377\377\377\5\376\376\376\377\240" \
-  "\266\262\377\223\254\247\377\235\263\257\377\332\342\341\377\374\333" \
-  "\343\342\377\4\245\272\266\377\223\254\247\377\230\260\253\377\371\373" \
-  "\372\377\212\377\377\377\377\1\301\317\314\377\202\223\254\247\377\1" \
-  "\316\331\327\377\313\333\343\342\377\1\313\325\324\377\204\260\275\273" \
-  "\377\1\206\230\225\377\203Slg\377\5czu\377\177\223\217\377\227\250\245" \
-  "\377\244\262\260\377\253\271\267\377\216\260\275\273\377\1s\210\204\377" \
-  "\202Slg\377\1\243\262\257\377\331\333\343\342\377\1\267\307\304\377\202" \
-  "\223\254\247\377\1\344\352\351\377\212\377\377\377\377\1\336\346\344" \
-  "\377\202\223\254\247\377\1\273\312\307\377\375\333\343\342\377\1\304" \
-  "\321\317\377\202\223\254\247\377\1\322\334\332\377\212\377\377\377\377" \
-  "\1\356\361\361\377\202\223\254\247\377\1\260\302\277\377\313\333\343" \
-  "\342\377\1\250\267\264\377\236Slg\377\1\243\262\257\377\330\333\343\342" \
-  "\377\4\331\342\341\377\232\261\255\377\223\254\247\377\245\272\266\377" \
-  "\213\377\377\377\377\4\261\303\277\377\223\254\247\377\225\256\251\377" \
-  "\326\337\336\377\375\333\343\342\377\4\332\342\341\377\233\262\255\377" \
-  "\223\254\247\377\244\271\265\377\213\377\377\377\377\4\257\302\276\377" \
-  "\223\254\247\377\226\256\251\377\327\337\336\377\312\333\343\342\377" \
-  "\1\250\267\264\377\236Slg\377\1\243\262\257\377\330\333\343\342\377\1" \
-  "\302\320\316\377\202\223\254\247\377\1\322\335\333\377\212\377\377\377" \
-  "\377\1\357\363\362\377\202\223\254\247\377\1\257\301\276\377\377\333" \
-  "\343\342\377\1\270\310\305\377\202\223\254\247\377\1\343\351\350\377" \
-  "\212\377\377\377\377\1\335\344\343\377\202\223\254\247\377\1\273\313" \
-  "\310\377\312\333\343\342\377\1\250\267\264\377\236Slg\377\1\243\262\257" \
-  "\377\330\333\343\342\377\4\244\271\265\377\223\254\247\377\231\260\254" \
-  "\377\372\373\373\377\212\377\377\377\377\1\302\320\315\377\202\223\254" \
-  "\247\377\1\315\330\327\377\377\333\343\342\377\4\324\336\334\377\224" \
-  "\255\250\377\223\254\247\377\266\307\303\377\212\377\377\377\377\5\375" \
-  "\376\375\377\237\265\261\377\223\254\247\377\236\264\260\377\332\342" \
-  "\341\377\311\333\343\342\377\1\250\267\264\377\236Slg\377\1\243\262\257" \
-  "\377\327\333\343\342\377\1\316\331\327\377\202\223\254\247\377\1\301" \
-  "\317\314\377\212\377\377\377\377\4\372\373\373\377\231\261\254\377\223" \
-  "\254\247\377\243\270\264\377\377\333\343\342\377\202\333\343\342\377" \
-  "\4\254\277\274\377\223\254\247\377\224\255\250\377\363\366\365\377\212" \
-  "\377\377\377\377\1\313\327\325\377\202\223\254\247\377\1\307\324\322" \
-  "\377\311\333\343\342\377\1\250\267\264\377\236Slg\377\1\243\262\257\377" \
-  "\327\333\343\342\377\1\260\302\276\377\202\223\254\247\377\1\356\362" \
-  "\361\377\212\377\377\377\377\1\324\336\334\377\202\223\254\247\377\1" \
-  "\301\317\315\377\377\333\343\342\377\202\333\343\342\377\1\312\326\324" \
-  "\377\202\223\254\247\377\1\307\324\321\377\212\377\377\377\377\4\366" \
-  "\370\367\377\225\256\251\377\223\254\247\377\251\275\271\377\311\333" \
-  "\343\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377\230\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\326\333\343\342" \
-  "\377\4\326\337\336\377\226\256\251\377\223\254\247\377\260\302\276\377" \
-  "\213\377\377\377\377\4\246\273\267\377\223\254\247\377\231\261\254\377" \
-  "\331\341\340\377\377\333\343\342\377\203\333\343\342\377\4\241\266\262" \
-  "\377\223\254\247\377\234\263\256\377\374\375\374\377\212\377\377\377" \
-  "\377\1\272\312\307\377\202\223\254\247\377\1\322\334\333\377\310\333" \
-  "\343\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377\230\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\326\333\343\342" \
-  "\377\1\273\313\310\377\202\223\254\247\377\1\335\345\344\377\212\377" \
-  "\377\377\377\1\346\353\352\377\202\223\254\247\377\1\266\306\303\377" \
-  "\377\333\343\342\377\204\333\343\342\377\1\277\315\313\377\202\223\254" \
-  "\247\377\1\330\341\337\377\212\377\377\377\377\1\350\355\354\377\202" \
-  "\223\254\247\377\1\264\305\302\377\310\333\343\342\377\1\250\267\264" \
-  "\377\202Slg\377\1x\214\210\377\230\333\343\342\377\1\202\225\221\377" \
-  "\202Slg\377\1\243\262\257\377\325\333\343\342\377\5\332\342\341\377\235" \
-  "\264\257\377\223\254\247\377\240\266\261\377\376\376\376\377\212\377" \
-  "\377\377\377\4\270\310\305\377\223\254\247\377\224\254\247\377\323\335" \
-  "\333\377\377\333\343\342\377\204\333\343\342\377\4\330\341\337\377\230" \
-  "\257\253\377\223\254\247\377\253\276\273\377\213\377\377\377\377\4\251" \
-  "\274\270\377\223\254\247\377\230\260\253\377\331\341\340\377\307\333" \
-  "\343\342\377\1\250\267\264\377\202Slg\377\1x\214\210\377\230\333\343" \
-  "\342\377\1\202\225\221\377\202Slg\377\1\243\262\257\377\325\333\343\342" \
-  "\377\1\307\324\322\377\202\223\254\247\377\1\314\330\325\377\212\377" \
-  "\377\377\377\4\364\367\366\377\225\255\250\377\223\254\247\377\252\276" \
-  "\272\377\377\333\343\342\377\206\333\343\342\377\1\263\305\301\377\202" \
-  "\223\254\247\377\1\352\357\356\377\212\377\377\377\377\1\326\340\336" \
-  "\377\202\223\254\247\377\1\300\316\314\377\307\333\343\342\377\1\250" \
-  "\267\264\377\202Slg\377\1x\214\210\377\230\333\343\342\377\1\223\244" \
-  "\241\377\202l\201}\377\1\255\272\270\377\325\333\343\342\377\4\251\274" \
-  "\271\377\223\254\247\377\225\256\251\377\366\370\370\377\212\377\377" \
-  "\377\377\1\312\326\323\377\202\223\254\247\377\1\310\325\323\377\377" \
-  "\333\343\342\377\206\333\343\342\377\1\321\333\332\377\202\223\254\247" \
-  "\377\1\274\314\311\377\212\377\377\377\377\4\373\374\374\377\233\262" \
-  "\255\377\223\254\247\377\242\267\263\377\377\333\343\342\377\274\333" \
-  "\343\342\377\1\322\334\332\377\202\223\254\247\377\1\272\312\307\377" \
-  "\212\377\377\377\377\4\375\375\375\377\236\264\260\377\223\254\247\377" \
-  "\237\265\260\377\377\333\343\342\377\210\333\343\342\377\4\250\274\270" \
-  "\377\223\254\247\377\226\256\252\377\367\371\371\377\212\377\377\377" \
-  "\377\1\304\322\317\377\202\223\254\247\377\1\314\327\325\377\377\333" \
-  "\343\342\377\273\333\343\342\377\1\264\305\302\377\202\223\254\247\377" \
-  "\1\350\355\354\377\212\377\377\377\377\1\333\343\342\377\202\223\254" \
-  "\247\377\1\275\314\311\377\377\333\343\342\377\210\333\343\342\377\1" \
-  "\306\323\321\377\202\223\254\247\377\1\316\331\327\377\212\377\377\377" \
-  "\377\1\361\364\363\377\202\223\254\247\377\1\255\300\274\377\377\333" \
-  "\343\342\377\272\333\343\342\377\4\331\341\340\377\230\260\253\377\223" \
-  "\254\247\377\251\275\271\377\213\377\377\377\377\4\256\300\275\377\223" \
-  "\254\247\377\226\257\252\377\327\340\337\377\377\333\343\342\377\210" \
-  "\333\343\342\377\5\332\342\341\377\234\263\257\377\223\254\247\377\241" \
-  "\267\263\377\376\376\376\377\212\377\377\377\377\4\263\305\301\377\223" \
-  "\254\247\377\225\255\250\377\325\336\335\377\377\333\343\342\377\271" \
-  "\333\343\342\377\1\300\316\314\377\202\223\254\247\377\1\327\340\336" \
-  "\377\212\377\377\377\377\1\354\361\360\377\202\223\254\247\377\1\261" \
-  "\303\300\377\377\333\343\342\377\212\333\343\342\377\1\272\312\307\377" \
-  "\202\223\254\247\377\1\340\347\345\377\212\377\377\377\377\1\341\350" \
-  "\346\377\202\223\254\247\377\1\271\311\306\377\340\333\343\342\377\1" \
-  "\317\330\327\377\202\305\320\316\377\1\320\331\330\377\324\333\343\342" \
-  "\377\4\241\267\263\377\223\254\247\377\233\262\255\377\374\374\374\377" \
-  "\212\377\377\377\377\1\277\316\313\377\202\223\254\247\377\1\317\332" \
-  "\330\377\377\333\343\342\377\212\333\343\342\377\4\326\337\336\377\225" \
-  "\256\251\377\223\254\247\377\262\304\300\377\212\377\377\377\377\5\376" \
-  "\376\376\377\243\270\264\377\223\254\247\377\234\262\256\377\332\342" \
-  "\341\377\337\333\343\342\377\1\216\237\234\377\202Slg\377\1\227\247\244" \
-  "\377\323\333\343\342\377\1\314\327\325\377\202\223\254\247\377\1\305" \
-  "\323\320\377\212\377\377\377\377\4\371\372\372\377\230\257\253\377\223" \
-  "\254\247\377\246\272\266\377\377\333\343\342\377\214\333\343\342\377" \
-  "\1\257\301\276\377\202\223\254\247\377\1\360\363\363\377\212\377\377" \
-  "\377\377\1\317\332\330\377\202\223\254\247\377\1\305\322\320\377\337" \
-  "\333\343\342\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\323\333" \
-  "\343\342\377\1\255\300\274\377\202\223\254\247\377\1\361\364\364\377" \
-  "\212\377\377\377\377\1\320\333\331\377\202\223\254\247\377\1\304\321" \
-  "\317\377\377\333\343\342\377\214\333\343\342\377\1\315\330\326\377\202" \
-  "\223\254\247\377\1\304\321\317\377\212\377\377\377\377\4\370\372\371" \
-  "\377\227\257\252\377\223\254\247\377\246\273\267\377\337\333\343\342" \
-  "\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\322\333\343\342\377" \
-  "\4\325\336\335\377\224\255\250\377\223\254\247\377\264\305\302\377\213" \
-  "\377\377\377\377\4\243\271\264\377\223\254\247\377\233\262\255\377\332" \
-  "\342\341\377\377\333\343\342\377\215\333\343\342\377\4\243\270\264\377" \
-  "\223\254\247\377\232\261\255\377\373\374\373\377\212\377\377\377\377" \
-  "\1\276\315\312\377\202\223\254\247\377\1\320\332\331\377\336\333\343" \
-  "\342\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\322\333\343\342" \
-  "\377\1\271\311\306\377\202\223\254\247\377\1\341\350\347\377\212\377" \
-  "\377\377\377\1\342\351\347\377\202\223\254\247\377\1\270\310\306\377" \
-  "\377\333\343\342\377\216\333\343\342\377\1\301\317\315\377\202\223\254" \
-  "\247\377\1\325\337\335\377\212\377\377\377\377\1\353\360\357\377\202" \
-  "\223\254\247\377\1\262\303\300\377\334\333\343\342\377\3\304\317\316" \
-  "\377\220\242\236\377]to\377\202Slg\377\1\227\247\244\377\321\333\343" \
-  "\342\377\5\332\342\341\377\233\262\256\377\223\254\247\377\243\270\264" \
-  "\377\376\376\376\377\212\377\377\377\377\4\264\306\302\377\223\254\247" \
-  "\377\224\255\250\377\325\336\335\377\377\333\343\342\377\216\333\343" \
-  "\342\377\4\331\341\340\377\231\260\254\377\223\254\247\377\247\273\267" \
-  "\377\213\377\377\377\377\4\255\300\274\377\223\254\247\377\227\257\252" \
-  "\377\327\340\337\377\330\333\343\342\377\3\323\335\333\377\246\263\261" \
-  "\377p\206\202\377\205Slg\377\1\227\247\244\377\321\333\343\342\377\1" \
-  "\304\322\317\377\202\223\254\247\377\1\320\333\331\377\212\377\377\377" \
-  "\377\4\362\365\364\377\224\254\250\377\223\254\247\377\236\264\260\377" \
-  "\377\333\343\342\377\220\333\343\342\377\1\266\306\303\377\202\223\254" \
-  "\247\377\1\346\354\353\377\202\377\377\377\377\4\370\371\371\377\342" \
-  "\351\347\377\333\343\342\377\360\363\363\377\204\377\377\377\377\1\332" \
-  "\343\341\377\202\223\254\247\377\1\276\315\312\377\326\333\343\342\377" \
-  "\3\273\306\304\377\206\230\225\377Xpl\377\207Slg\377\1\227\247\244\377" \
-  "\321\333\343\342\377\4\246\272\266\377\223\254\247\377\227\257\252\377" \
-  "\370\372\371\377\212\377\377\377\377\1\306\323\321\377\203\223\254\247" \
-  "\377\1\314\327\325\377\377\333\343\342\377\217\333\343\342\377\6\323" \
-  "\335\333\377\224\254\247\377\223\254\247\377\267\307\304\377\304\321" \
-  "\317\377\242\267\263\377\204\223\254\247\377\10\232\262\255\377\263\304" \
-  "\301\377\353\360\357\377\377\377\377\377\374\375\375\377\235\264\257" \
-  "\377\223\254\247\377\237\265\261\377\323\333\343\342\377\3\315\327\325" \
-  "\377\233\253\250\377g}y\377\212Slg\377\1\227\247\244\377\320\333\343" \
-  "\342\377\1\320\332\331\377\202\223\254\247\377\1\277\315\312\377\212" \
-  "\377\377\377\377\6\374\374\374\377\233\262\256\377\223\254\247\377\235" \
-  "\264\257\377\223\254\247\377\266\307\304\377\377\333\343\342\377\220" \
-  "\333\343\342\377\3\252\275\272\377\222\253\247\377\222\254\247\377\202" \
-  "\223\254\247\377\12\237\265\261\377\266\307\304\377\276\315\312\377\250" \
-  "\274\270\377\225\256\251\377\223\254\247\377\225\256\251\377\312\327" \
-  "\324\377\375\376\376\377\311\325\323\377\202\223\254\247\377\1\311\325" \
-  "\323\377\317\333\343\342\377\4\330\341\340\377\260\275\273\377|\217\214" \
-  "\377Umh\377\214Slg\377\1\227\247\244\377\320\333\343\342\377\1\262\303" \
-  "\300\377\202\223\254\247\377\1\354\360\357\377\212\377\377\377\377\1" \
-  "\330\341\337\377\202\223\254\247\377\3\306\323\320\377\223\254\247\377" \
-  "\250\273\270\377\377\333\343\342\377\220\333\343\342\377\1\263\305\301" \
-  "\377\202\223\254\247\377\2\263\305\301\377\362\365\365\377\204\377\377" \
-  "\377\377\11\374\374\374\377\317\332\330\377\226\257\252\377\223\254\247" \
-  "\377\257\301\276\377\363\365\365\377\225\255\250\377\223\254\247\377" \
-  "\253\276\272\377\315\333\343\342\377\3\305\320\316\377\220\242\236\377" \
-  "_vr\377\217Slg\377\1\227\247\244\377\317\333\343\342\377\4\327\340\337" \
-  "\377\227\257\252\377\223\254\247\377\255\300\274\377\213\377\377\377" \
-  "\377\6\252\275\271\377\223\254\247\377\233\262\255\377\366\370\370\377" \
-  "\224\255\250\377\230\260\254\377\377\333\343\342\377\217\333\343\342" \
-  "\377\4\321\333\331\377\226\256\251\377\223\254\247\377\324\336\334\377" \
-  "\210\377\377\377\377\10\355\361\361\377\243\270\264\377\223\254\247\377" \
-  "\315\330\326\377\267\310\305\377\223\254\247\377\224\255\250\377\323" \
-  "\335\334\377\311\333\343\342\377\3\324\335\334\377\245\264\262\377q\206" \
-  "\203\377\217Slg\377\1\\to\377\202Slg\377\1\227\247\244\377\317\333\343" \
-  "\342\377\1\275\314\311\377\202\223\254\247\377\1\333\343\341\377\212" \
-  "\377\377\377\377\1\351\356\355\377\202\223\254\247\377\5\304\322\317" \
-  "\377\377\377\377\377\231\261\254\377\224\254\247\377\331\342\341\377" \
-  "\377\333\343\342\377\215\333\343\342\377\4\332\342\341\377\244\271\265" \
-  "\377\223\254\247\377\302\320\316\377\212\377\377\377\377\4\351\356\355" \
-  "\377\225\255\250\377\226\256\251\377\327\340\335\377\202\223\254\247" \
-  "\377\1\266\307\304\377\307\333\343\342\377\3\273\307\305\377\206\231" \
-  "\225\377Xpl\377\216Slg\377\4d{w\377\230\250\245\377\313\325\323\377\216" \
-  "\237\234\377\202Slg\377\1\227\247\244\377\317\333\343\342\377\4\237\265" \
-  "\261\377\223\254\247\377\236\264\257\377\375\375\375\377\212\377\377" \
-  "\377\377\1\274\313\310\377\202\223\254\247\377\202\361\364\363\377\2" \
-  "\223\254\247\377\240\265\261\377\377\333\343\342\377\216\333\343\342" \
-  "\377\4\306\323\321\377\223\254\247\377\244\271\264\377\373\374\374\377" \
-  "\213\377\377\377\377\7\310\325\322\377\223\254\247\377\267\310\305\377" \
-  "\246\272\266\377\223\254\247\377\232\261\254\377\331\341\340\377\303" \
-  "\333\343\342\377\3\316\327\326\377\233\253\251\377g}y\377\216Slg\377" \
-  "\4Wpj\377\204\226\223\377\270\305\302\377\332\342\341\377\202\333\343" \
-  "\342\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\316\333\343\342" \
-  "\377\1\311\325\323\377\202\223\254\247\377\1\311\325\323\377\206\377" \
-  "\377\377\377\14\346\353\352\377\301\317\314\377\337\346\345\377\376\376" \
-  "\376\377\367\371\370\377\226\256\251\377\223\254\247\377\263\304\301" \
-  "\377\377\377\377\377\332\342\341\377\223\254\247\377\256\302\276\377" \
-  "\377\333\343\342\377\216\333\343\342\377\3\267\307\304\377\223\254\247" \
-  "\377\316\331\327\377\214\377\377\377\377\4\367\370\370\377\223\254\247" \
-  "\377\240\266\262\377\323\335\333\377\202\223\254\247\377\1\302\320\316" \
-  "\377\300\333\343\342\377\4\330\341\340\377\261\275\273\377|\220\214\377" \
-  "Umh\377\216Slg\377\3p\205\201\377\244\263\260\377\323\334\333\377\205" \
-  "\333\343\342\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\316\333" \
-  "\343\342\377\4\253\276\272\377\223\254\247\377\225\255\250\377\364\367" \
-  "\366\377\205\377\377\377\377\1\326\337\336\377\203\223\254\247\377\2" \
-  "\302\320\315\377\315\330\326\377\202\223\254\247\377\5\340\347\346\377" \
-  "\377\377\377\377\257\301\276\377\223\254\247\377\276\315\313\377\377" \
-  "\333\343\342\377\216\333\343\342\377\3\251\274\271\377\223\254\247\377" \
-  "\344\352\351\377\215\377\377\377\377\6\240\266\262\377\223\254\247\377" \
-  "\362\365\364\377\231\261\254\377\223\254\247\377\244\271\265\377\252" \
-  "\333\343\342\377\11\330\340\337\377\243\262\257\377\204\227\224\377j" \
-  "\200{\377Wpj\377f|x\377{\216\213\377\255\274\271\377\330\341\340\377" \
-  "\213\333\343\342\377\3\305\320\316\377\221\242\237\377_vr\377\216Slg" \
-  "\377\3^vq\377\220\241\236\377\304\317\315\377\210\333\343\342\377\1\216" \
-  "\237\234\377\202Slg\377\1\227\247\244\377\316\333\343\342\377\3\226\256" \
-  "\251\377\223\254\247\377\266\307\303\377\206\377\377\377\377\15\252\276" \
-  "\272\377\223\254\247\377\302\320\316\377\223\254\247\377\232\261\255" \
-  "\377\237\265\261\377\223\254\247\377\242\270\263\377\376\376\376\377" \
-  "\321\334\331\377\223\254\247\377\235\263\257\377\330\340\340\377\377" \
-  "\333\343\342\377\216\333\343\342\377\3\234\262\256\377\223\254\247\377" \
-  "\370\372\371\377\215\377\377\377\377\4\264\306\302\377\223\254\247\377" \
-  "\344\352\351\377\300\316\313\377\202\223\254\247\377\1\325\336\335\377" \
-  "\250\333\343\342\377\2\303\316\315\377m\202~\377\207Slg\377\2g}y\377" \
-  "\306\321\317\377\207\333\343\342\377\3\324\335\334\377\246\265\263\377" \
-  "q\206\203\377\216Slg\377\4Umh\377|\217\214\377\260\275\273\377\330\340" \
-  "\337\377\212\333\343\342\377\1\257\274\273\377\202\216\237\234\377\1" \
-  "\264\300\277\377\316\333\343\342\377\3\230\257\253\377\223\254\247\377" \
-  "\276\315\312\377\206\377\377\377\377\5\270\311\305\377\223\254\247\377" \
-  "\244\271\264\377\223\254\247\377\240\266\262\377\202\223\254\247\377" \
-  "\5\317\332\330\377\335\345\343\377\226\256\251\377\223\254\247\377\312" \
-  "\326\324\377\377\333\343\342\377\217\333\343\342\377\3\241\267\263\377" \
-  "\223\254\247\377\356\362\362\377\215\377\377\377\377\4\253\276\272\377" \
-  "\223\254\247\377\355\361\360\377\310\325\322\377\202\223\254\247\377" \
-  "\1\327\340\336\377\247\333\343\342\377\2\261\275\273\377Woj\377\211S" \
-  "lg\377\2[to\377\301\314\312\377\204\333\343\342\377\3\273\307\305\377" \
-  "\207\231\225\377Yql\377\206Slg\377\4Rkg\377Skf\377Slf\377Rkg\377\204" \
-  "Slg\377\3h~z\377\234\254\251\377\316\327\326\377\337\333\343\342\377" \
-  "\3\233\262\255\377\223\254\247\377\271\311\306\377\206\377\377\377\377" \
-  "\10\351\356\355\377\240\266\261\377\223\254\247\377\233\262\256\377\247" \
-  "\273\266\377\223\254\247\377\226\256\252\377\267\310\304\377\202\223" \
-  "\254\247\377\1\267\307\305\377\377\333\343\342\377\220\333\343\342\377" \
-  "\3\260\302\277\377\223\254\247\377\330\341\340\377\214\377\377\377\377" \
-  "\5\375\376\376\377\226\257\252\377\227\257\252\377\376\376\376\377\304" \
-  "\321\317\377\202\223\254\247\377\1\332\342\341\377\246\333\343\342\377" \
-  "\2\315\327\325\377]to\377\203Slg\377\5Zqm\377x\214\210\377\210\232\226" \
-  "\377r\210\204\377Vnj\377\203Slg\377\5j\200{\377\327\340\336\377\316\327" \
-  "\326\377\233\253\251\377g}y\377\211Slg\377\10Skf\377Rkg\377Slg\377Rl" \
-  "f\377Slg\377Zqm\377\207\233\227\377\275\310\306\377\342\333\343\342\377" \
-  "\3\236\264\260\377\223\254\247\377\264\306\302\377\207\377\377\377\377" \
-  "\3\376\376\376\377\346\354\353\377\354\360\357\377\204\223\254\247\377" \
-  "\2\232\261\255\377\305\322\320\377\377\333\343\342\377\221\333\343\342" \
-  "\377\3\276\315\312\377\223\254\247\377\274\313\310\377\214\377\377\377" \
-  "\377\7\344\352\351\377\223\254\247\377\253\277\273\377\377\377\377\377" \
-  "\277\315\312\377\223\254\247\377\225\255\250\377\247\333\343\342\377" \
-  "\1y\215\212\377\203Slg\377\2x\214\211\377\315\327\325\377\203\333\343" \
-  "\342\377\2\301\314\312\377h~z\377\203Slg\377\2j\200{\377Umh\377\213S" \
-  "lg\377\6Skf\377Rkg\377Slg\377Xqk\377\250\266\263\377\325\336\335\377" \
-  "\344\333\343\342\377\3\241\266\262\377\223\254\247\377\260\302\276\377" \
-  "\211\377\377\377\377\1\302\320\315\377\202\223\254\247\377\3\231\260" \
-  "\253\377\260\302\277\377\325\336\336\377\377\333\343\342\377\222\333" \
-  "\343\342\377\4\323\334\334\377\226\256\251\377\223\254\247\377\344\352" \
-  "\351\377\212\377\377\377\377\10\374\374\374\377\245\272\265\377\223\254" \
-  "\247\377\320\333\331\377\377\377\377\377\272\312\307\377\223\254\247" \
-  "\377\230\257\253\377\246\333\343\342\377\1\314\325\325\377\203Slg\377" \
-  "\2j\201|\377\326\337\336\377\205\333\343\342\377\2\311\323\321\377Yq" \
-  "l\377\217Slg\377\4_uq\377Slh\377Slg\377i\200{\377\346\333\343\342\377" \
-  "\3\244\271\265\377\223\254\247\377\253\276\273\377\210\377\377\377\377" \
-  "\4\372\373\373\377\231\261\254\377\223\254\247\377\242\267\263\377\377" \
-  "\333\343\342\377\226\333\343\342\377\4\275\314\311\377\223\254\247\377" \
-  "\241\266\262\377\371\372\372\377\211\377\377\377\377\10\303\321\316\377" \
-  "\223\254\247\377\254\277\273\377\376\376\376\377\377\377\377\377\265" \
-  "\306\303\377\223\254\247\377\233\262\255\377\246\333\343\342\377\1\263" \
-  "\300\276\377\203Slg\377\1\263\300\276\377\207\333\343\342\377\1\222\243" \
-  "\237\377\214Slg\377\7Vnj\377\200\223\220\377\264\300\277\377\300\313" \
-  "\311\377Umi\377Slg\377i\200{\377\346\333\343\342\377\3\247\273\267\377" \
-  "\223\254\247\377\246\273\267\377\210\377\377\377\377\1\324\336\334\377" \
-  "\202\223\254\247\377\1\302\320\315\377\377\333\343\342\377\227\333\343" \
-  "\342\377\4\246\272\267\377\223\254\247\377\241\267\262\377\345\353\352" \
-  "\377\206\377\377\377\377\5\367\371\370\377\267\310\305\377\223\254\247" \
-  "\377\227\257\252\377\357\363\362\377\202\377\377\377\377\3\261\303\277" \
-  "\377\223\254\247\377\236\264\260\377\246\333\343\342\377\1\232\252\247" \
-  "\377\203Slg\377\1\317\330\327\377\207\333\343\342\377\1\260\275\273\377" \
-  "\212Slg\377\3l\201}\377\240\260\254\377\320\332\331\377\202\333\343\342" \
-  "\377\4\301\314\312\377Umi\377Slg\377i\200{\377\346\333\343\342\377\3" \
-  "\252\275\272\377\223\254\247\377\242\267\263\377\210\377\377\377\377" \
-  "\4\246\273\267\377\223\254\247\377\231\261\254\377\331\341\340\377\377" \
-  "\333\343\342\377\227\333\343\342\377\16\325\336\334\377\246\272\267\377" \
-  "\223\254\247\377\224\255\250\377\271\311\306\377\322\334\332\377\351" \
-  "\356\355\377\361\364\363\377\333\343\341\377\304\322\317\377\235\264" \
-  "\257\377\223\254\247\377\235\263\257\377\341\350\346\377\203\377\377" \
-  "\377\377\3\254\277\273\377\223\254\247\377\241\267\262\377\246\333\343" \
-  "\342\377\1\233\253\250\377\203Slg\377\1\315\327\325\377\207\333\343\342" \
-  "\377\1\256\274\272\377\207Slg\377\3[to\377\214\236\232\377\300\314\312" \
-  "\377\205\333\343\342\377\4\301\314\312\377Umi\377Slg\377i\200{\377\346" \
-  "\333\343\342\377\3\255\300\274\377\223\254\247\377\235\263\257\377\207" \
-  "\377\377\377\377\1\346\353\352\377\202\223\254\247\377\1\266\307\304" \
-  "\377\377\333\343\342\377\232\333\343\342\377\2\275\314\311\377\226\256" \
-  "\251\377\207\223\254\247\377\2\267\310\305\377\367\371\370\377\204\377" \
-  "\377\377\377\3\247\273\267\377\223\254\247\377\244\271\265\377\246\333" \
-  "\343\342\377\1\265\301\300\377\203Slg\377\1\261\275\273\377\207\333\343" \
-  "\342\377\1\217\240\235\377\206Slg\377\2p\205\201\377\311\324\322\377" \
-  "\207\333\343\342\377\4\301\314\312\377Umi\377Slg\377i\200{\377\346\333" \
-  "\343\342\377\3\260\302\277\377\223\254\247\377\230\260\253\377\207\377" \
-  "\377\377\377\4\270\310\305\377\223\254\247\377\224\254\247\377\323\335" \
-  "\333\377\377\333\343\342\377\233\333\343\342\377\10\324\336\335\377\302" \
-  "\321\316\377\264\305\302\377\244\271\265\377\223\254\247\377\223\253" \
-  "\246\377\241\266\262\377\353\360\357\377\206\377\377\377\377\3\242\270" \
-  "\263\377\223\254\247\377\247\273\267\377\246\333\343\342\377\1\316\327" \
-  "\326\377\203Slg\377\2i\177{\377\326\337\336\377\205\333\343\342\377\2" \
-  "\307\322\320\377Vpk\377\207Slg\377\4Umh\377|\217\214\377\260\275\273" \
-  "\377\330\341\340\377\204\333\343\342\377\4\301\314\312\377Umi\377Slg" \
-  "\377i\200{\377\346\333\343\342\377\1\263\304\301\377\202\223\254\247" \
-  "\377\206\377\377\377\377\4\364\367\366\377\225\255\250\377\223\254\247" \
-  "\377\253\276\272\377\377\333\343\342\377\240\333\343\342\377\1\264\305" \
-  "\302\377\202\223\254\247\377\1\351\356\355\377\206\377\377\377\377\3" \
-  "\236\264\257\377\223\254\247\377\252\275\272\377\247\333\343\342\377" \
-  "\1\177\222\216\377\203Slg\377\2v\212\206\377\312\324\323\377\203\333" \
-  "\343\342\377\2\271\305\303\377e|w\377\203Slg\377\2j\201|\377Umh\377\206" \
-  "Slg\377\3^vq\377\220\242\236\377\304\317\316\377\202\333\343\342\377" \
-  "\4\301\314\312\377Umi\377Slg\377i\200{\377\346\333\343\342\377\1\266" \
-  "\307\304\377\202\223\254\247\377\1\373\374\374\377\205\377\377\377\377" \
-  "\1\312\326\323\377\202\223\254\247\377\1\311\325\323\377\377\333\343" \
-  "\342\377\240\333\343\342\377\1\321\333\332\377\202\223\254\247\377\1" \
-  "\274\313\310\377\206\377\377\377\377\3\231\260\254\377\223\254\247\377" \
-  "\255\300\274\377\247\333\343\342\377\2\320\332\331\377_wr\377\203Slg" \
-  "\377\4Uni\377k\201|\377{\216\213\377e}w\377\204Slg\377\5m\203\177\377" \
-  "\330\340\337\377\316\330\326\377\235\254\252\377i\177z\377\207Slg\377" \
-  "\6p\206\202\377\246\263\261\377\273\307\304\377Umi\377Slg\377i\200{\377" \
-  "\346\333\343\342\377\1\271\311\306\377\202\223\254\247\377\1\366\370" \
-  "\370\377\204\377\377\377\377\4\375\375\375\377\236\264\260\377\223\254" \
-  "\247\377\237\265\261\377\377\333\343\342\377\242\333\343\342\377\4\250" \
-  "\274\270\377\223\254\247\377\226\256\252\377\367\371\370\377\205\377" \
-  "\377\377\377\3\224\255\250\377\223\254\247\377\260\302\277\377\250\333" \
-  "\343\342\377\2\266\303\300\377Yql\377\211Slg\377\2_vr\377\305\320\316" \
-  "\377\204\333\343\342\377\3\274\311\307\377\210\232\227\377Zrm\377\206" \
-  "Slg\377\4Wnj\377Skg\377Slg\377i\200{\377\346\333\343\342\377\1\274\313" \
-  "\311\377\202\223\254\247\377\1\361\364\364\377\204\377\377\377\377\1" \
-  "\333\343\342\377\202\223\254\247\377\1\275\314\311\377\377\333\343\342" \
-  "\377\242\333\343\342\377\1\306\323\321\377\202\223\254\247\377\1\315" \
-  "\331\326\377\204\377\377\377\377\1\374\374\374\377\202\223\254\247\377" \
-  "\1\263\305\301\377\251\333\343\342\377\2\311\324\322\377v\212\206\377" \
-  "\207Slg\377\2k\201|\377\311\324\322\377\207\333\343\342\377\3\325\336" \
-  "\335\377\251\267\264\377t\211\205\377\204Slg\377\6Skf\377Rkg\377Slg\377" \
-  "Uoi\377\232\253\247\377\314\326\325\377\344\333\343\342\377\1\277\316" \
-  "\313\377\202\223\254\247\377\1\355\361\360\377\204\377\377\377\377\4" \
-  "\256\300\275\377\223\254\247\377\226\257\252\377\327\340\337\377\377" \
-  "\333\343\342\377\242\333\343\342\377\5\332\342\341\377\235\263\257\377" \
-  "\223\254\247\377\241\267\262\377\376\376\376\377\203\377\377\377\377" \
-  "\1\367\371\370\377\202\223\254\247\377\1\266\307\304\377\252\333\343" \
-  "\342\377\11\332\342\341\377\260\275\273\377\222\243\237\377w\213\210" \
-  "\377d{w\377r\207\203\377\206\230\225\377\265\302\300\377\332\342\341" \
-  "\377\213\333\343\342\377\5\307\322\320\377\225\245\242\377bxt\377Slg" \
-  "\377Skf\377\203Slf\377\5Slg\377Tmh\377{\216\213\377\257\274\273\377\330" \
-  "\340\337\377\341\333\343\342\377\1\302\320\316\377\202\223\254\247\377" \
-  "\1\350\355\354\377\203\377\377\377\377\1\354\361\360\377\202\223\254" \
-  "\247\377\1\262\303\300\377\377\333\343\342\377\244\333\343\342\377\1" \
-  "\273\312\307\377\202\223\254\247\377\1\337\346\345\377\203\377\377\377" \
-  "\377\1\362\365\364\377\202\223\254\247\377\1\271\311\306\377\300\333" \
-  "\343\342\377\6\332\342\341\377\265\301\300\377~\223\217\377Vnj\377Sk" \
-  "g\377Slf\377\204Slg\377\3^uq\377\217\241\236\377\304\317\315\377\337" \
-  "\333\343\342\377\1\305\322\320\377\202\223\254\247\377\1\343\352\350" \
-  "\377\203\377\377\377\377\1\277\316\313\377\202\223\254\247\377\1\317" \
-  "\332\330\377\377\333\343\342\377\244\333\343\342\377\4\326\337\336\377" \
-  "\225\256\251\377\223\254\247\377\261\303\300\377\203\377\377\377\377" \
-  "\1\356\361\361\377\202\223\254\247\377\1\274\313\311\377\303\333\343" \
-  "\342\377\3\321\332\331\377\240\257\255\377m\202~\377\207Slg\377\3p\205" \
-  "\201\377\244\263\260\377\323\334\333\377\212\333\343\342\377\1\257\274" \
-  "\273\377\202\216\237\234\377\1\264\300\277\377\316\333\343\342\377\1" \
-  "\310\325\323\377\202\223\254\247\377\7\243\271\264\377\272\312\307\377" \
-  "\315\330\326\377\336\345\344\377\230\257\253\377\223\254\247\377\246" \
-  "\272\266\377\377\333\343\342\377\246\333\343\342\377\1\257\301\276\377" \
-  "\202\223\254\247\377\4\332\342\340\377\317\332\330\377\274\313\310\377" \
-  "\246\273\267\377\202\223\254\247\377\1\277\316\313\377\306\333\343\342" \
-  "\377\3\301\314\312\377\215\237\233\377\\to\377\206Slg\377\3Xpk\377\204" \
-  "\227\224\377\271\305\303\377\210\333\343\342\377\1\216\237\234\377\202" \
-  "Slg\377\1\227\247\244\377\316\333\343\342\377\1\313\327\325\377\210\223" \
-  "\254\247\377\1\304\321\317\377\377\333\343\342\377\246\333\343\342\377" \
-  "\1\315\330\327\377\210\223\254\247\377\1\303\320\316\377\310\333\343" \
-  "\342\377\3\326\337\336\377\255\272\270\377x\215\210\377\207Slg\377\3" \
-  "e}w\377\232\252\246\377\314\325\325\377\205\333\343\342\377\1\216\237" \
-  "\234\377\202Slg\377\1\227\247\244\377\316\333\343\342\377\5\326\337\336" \
-  "\377\271\311\306\377\217\245\241\377\206\237\232\377\220\251\244\377" \
-  "\203\223\254\247\377\2\233\262\256\377\332\342\341\377\377\333\343\342" \
-  "\377\247\333\343\342\377\1\243\270\264\377\203\223\254\247\377\5\221" \
-  "\252\245\377\210\241\234\377\203\233\226\377\267\310\305\377\323\335" \
-  "\333\377\313\333\343\342\377\3\313\326\324\377\230\251\246\377f|x\377" \
-  "\206Slg\377\4Tmh\377z\216\212\377\256\274\272\377\330\340\337\377\202" \
-  "\333\343\342\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\320\333" \
-  "\343\342\377\1p\206\202\377\202Slg\377\4\\up\377o\207\203\377\270\310" \
-  "\305\377\303\321\316\377\377\333\343\342\377\250\333\343\342\377\10\307" \
-  "\324\322\377\267\307\304\377\200\226\221\377]vq\377Tmh\377Slg\377Woj" \
-  "\377\331\342\341\377\316\333\343\342\377\4\332\342\341\377\271\305\303" \
-  "\377\204\227\224\377Xpk\377\206Slg\377\4]up\377\217\240\235\377\303\316" \
-  "\315\377\216\237\234\377\202Slg\377\1\227\247\244\377\320\333\343\342" \
-  "\377\1Zrm\377\203Slg\377\1y\216\211\377\377\333\343\342\377\254\333\343" \
-  "\342\377\2\226\247\244\377Tmh\377\202Slg\377\2[sn\377\307\322\320\377" \
-  "\321\333\343\342\377\3\323\334\333\377\245\264\261\377q\205\201\377\207" \
-  "Slg\377\1Xpl\377\202Slg\377\1\227\247\244\377\320\333\343\342\377\1_" \
-  "wr\377\203Slg\377\1\227\247\244\377\377\333\343\342\377\254\333\343\342" \
-  "\377\2\261\276\274\377[sn\377\202Slg\377\2Zrm\377\260\276\273\377\324" \
-  "\333\343\342\377\3\304\317\316\377\221\242\237\377_vr\377\207Slg\377" \
-  "\1\227\247\244\377\320\333\343\342\377\1p\206\202\377\202Slg\377\2Xp" \
-  "l\377\317\330\327\377\377\333\343\342\377\254\333\343\342\377\2\311\324" \
-  "\322\377Zrn\377\202Slg\377\2Yrm\377\313\325\324\377\326\333\343\342\377" \
-  "\4\330\341\340\377\261\276\274\377|\221\215\377Umh\377\204Slg\377\1\227" \
-  "\247\244\377\320\333\343\342\377\1\203\226\222\377\202Slg\377\1\222\243" \
-  "\237\377\377\333\343\342\377\256\333\343\342\377\4Xpk\377Slg\377Yql\377" \
-  "\241\261\256\377\332\333\343\342\377\3\316\330\326\377\235\254\252\377" \
-  "byu\377\202Slg\377\1\227\247\244\377\320\333\343\342\377\4\224\245\242" \
-  "\377Slg\377Yql\377\320\331\330\377\377\333\343\342\377\256\333\343\342" \
-  "\377\4j\200{\377Slg\377o\204\200\377\332\342\341\377\334\333\343\342" \
-  "\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\320\333\343\342\377" \
-  "\3\245\264\262\377Slg\377\223\243\241\377\377\333\343\342\377\257\333" \
-  "\343\342\377\3\205\230\224\377Vnj\377\312\324\323\377\335\333\343\342" \
-  "\377\1\216\237\234\377\202Slg\377\1\227\247\244\377\320\333\343\342\377" \
-  "\3\267\304\302\377Zqm\377\320\332\331\377\377\333\343\342\377\257\333" \
-  "\343\342\377\2\304\317\315\377\264\301\277\377\336\333\343\342\377\1" \
-  "\216\237\234\377\202Slg\377\1\227\247\244\377\320\333\343\342\377\2\311" \
-  "\323\321\377\223\244\242\377\377\333\343\342\377\377\333\343\342\377" \
-  "\221\333\343\342\377\1\256\273\270\377\202\211\233\230\377\1\262\277" \
-  "\275\377\320\333\343\342\377\2\330\341\340\377\321\332\331\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\231\333\343" \
-  "\342\377")
-
-
diff --git a/packages/psplash/files/angstrom/psplash-hand-img.h b/packages/psplash/files/angstrom/psplash-hand-img.h
index a03d16e57a..263befa564 100644
--- a/packages/psplash/files/angstrom/psplash-hand-img.h
+++ b/packages/psplash/files/angstrom/psplash-hand-img.h
@@ -1,1336 +1,1454 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (1016)
-#define HAND_IMG_WIDTH (254)
-#define HAND_IMG_HEIGHT (264)
+#define HAND_IMG_ROWSTRIDE (920)
+#define HAND_IMG_WIDTH (230)
+#define HAND_IMG_HEIGHT (231)
 #define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
 #define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\331\333\343\342\377\5\327" \
-  "\340\337\377\314\327\325\377\306\323\320\377\321\333\331\377\332\342" \
-  "\341\377\377\333\343\342\377\206\333\343\342\377\1\276\311\307\377\202" \
-  "g~y\377\357\333\343\342\377\2\253\276\272\377\233\262\255\377\204\223" \
-  "\254\247\377\3\225\255\250\377\240\266\262\377\303\321\316\377\377\333" \
-  "\343\342\377\204\333\343\342\377\1\270\305\303\377\202Slg\377\357\333" \
-  "\343\342\377\11\231\260\254\377\223\254\247\377\243\271\264\377\267\307" \
-  "\304\377\277\316\313\377\256\301\275\377\232\261\255\377\223\254\247" \
-  "\377\271\311\306\377\377\333\343\342\377\204\333\343\342\377\1\270\305" \
-  "\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377" \
-  "\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\364\333\343" \
-  "\342\377\4\332\342\341\377\316\330\326\377\277\312\310\377\260\275\273" \
-  "\377\213\254\271\267\377\1\225\246\243\377\202Slg\377\357\333\343\342" \
-  "\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254" \
-  "\247\377\271\311\306\377\362\333\343\342\377\3\266\302\300\377v\212\206" \
-  "\377Vni\377\221Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\360\333" \
-  "\343\342\377\2\320\331\330\377n\204\200\377\224Slg\377\357\333\343\342" \
-  "\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254" \
-  "\247\377\271\311\306\377\357\333\343\342\377\2\332\342\341\377x\215\211" \
-  "\377\225Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377\377" \
-  "\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333\343\342" \
-  "\377\1\240\260\255\377\204Slg\377\4Uni\377s\210\203\377\177\222\217\377" \
-  "\213\235\231\377\213\222\243\240\377\1\202\225\221\377\202Slg\377\357" \
-  "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
-  "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\1{\217\213\377" \
-  "\203Slg\377\2\230\250\245\377\317\330\327\377\216\333\343\342\377\1\270" \
-  "\305\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\1byt\377\202Slg\377\1\230\250\245\377\220\333\343\342\377" \
-  "\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377" \
-  "\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377" \
-  "\356\333\343\342\377\1\324\335\334\377\203Slg\377\1\324\334\333\377\220" \
-  "\333\343\342\377\1\274\307\306\377\202_vr\377\357\333\343\342\377\202" \
-  "\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377" \
-  "\271\311\306\377\356\333\343\342\377\4\332\342\341\377Xql\377Slg\377" \
-  "f|x\377\377\333\343\342\377\204\333\343\342\377\202\231\260\254\377\204" \
-  "\377\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357" \
-  "\333\343\342\377\3n\204\200\377Slg\377_vr\377\377\333\343\342\377\204" \
-  "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
-  "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\1\243\262\257" \
-  "\377\202Slg\377\1\311\324\322\377\220\333\343\342\377\1\325\336\335\377" \
-  "\202\305\320\316\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\4\327\337\336\377dzv\377Slg\377\220\242\236\377\220\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231" \
-  "\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271" \
-  "\311\306\377\360\333\343\342\377\4\307\321\320\377`ws\377Slg\377\240" \
-  "\260\255\377\217\333\343\342\377\1\270\305\303\377\202Slg\377\357\333" \
-  "\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377" \
-  "\223\254\247\377\271\311\306\377\361\333\343\342\377\6\307\322\320\377" \
-  "u\211\205\377Slg\377m\202~\377\246\265\262\377\321\333\331\377\214\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231" \
-  "\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271" \
-  "\311\306\377\362\333\343\342\377\2\332\342\341\377\213\235\231\377\203" \
-  "Slg\377\3Xpk\377f}x\377s\210\203\377\211t\211\205\377\1l\201}\377\202" \
-  "Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3" \
-  "\326\337\335\377\223\254\247\377\271\311\306\377\361\333\343\342\377" \
-  "\2\265\302\300\377i\177{\377\223Slg\377\357\333\343\342\377\202\231\260" \
-  "\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271\311" \
-  "\306\377\360\333\343\342\377\2\255\272\270\377Uni\377\224Slg\377\357" \
-  "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
-  "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\2\316\327\326" \
-  "\377Wpk\377\225Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\1\220\241\236\377\203Slg\377\5Woj\377\205\227\224\377\254" \
-  "\271\267\377\270\304\302\377\304\316\315\377\213\311\324\322\377\1\254" \
-  "\271\267\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
-  "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
-  "\343\342\377\1i\177{\377\202Slg\377\2dzv\377\316\327\326\377\217\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231" \
-  "\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254\247\377\271" \
-  "\311\306\377\356\333\343\342\377\2\331\342\341\377Voj\377\202Slg\377" \
-  "\1\273\307\305\377\220\333\343\342\377\1\270\305\303\377\202Slg\377\357" \
-  "\333\343\342\377\3\241\267\262\377\223\254\247\377\363\366\365\377\203" \
-  "\377\377\377\377\3\304\321\317\377\223\254\247\377\301\317\314\377\356" \
-  "\333\343\342\377\1\324\335\334\377\202Slg\377\2Xpk\377\331\342\341\377" \
-  "\220\333\343\342\377\1\311\324\322\377\202\226\247\244\377\357\333\343" \
-  "\342\377\3\264\305\302\377\223\254\247\377\326\337\335\377\203\377\377" \
-  "\377\377\3\246\273\267\377\223\254\247\377\324\335\334\377\357\333\343" \
-  "\342\377\3_vr\377Slg\377i\177{\377\377\333\343\342\377\202\333\343\342" \
-  "\377\5\317\332\331\377\257\301\276\377\217\251\244\377\223\254\247\377" \
-  "\270\310\305\377\202\377\377\377\377\6\365\367\367\377\223\254\247\377" \
-  "\217\251\244\377\234\263\257\377\275\314\312\377\330\341\340\377\355" \
-  "\333\343\342\377\4\177\222\217\377Slg\377Vni\377\327\337\336\377\376" \
-  "\333\343\342\377\2\277\316\313\377\207\243\236\377\203o\221\212\377\7" \
-  "\221\253\246\377\233\262\256\377\376\376\376\377\377\377\377\377\330" \
-  "\341\337\377\223\254\247\377\202\237\231\377\202o\221\212\377\3t\225" \
-  "\216\377\234\263\257\377\322\334\333\377\353\333\343\342\377\1\277\313" \
-  "\311\377\202Slg\377\1\273\307\305\377\220\333\343\342\377\1\307\322\320" \
-  "\377\202\216\237\234\377\351\333\343\342\377\2\310\325\323\377\216\251" \
-  "\243\377\204o\221\212\377\10v\226\220\377\221\252\245\377\223\254\247" \
-  "\377\324\336\334\377\340\347\346\377\262\304\300\377\223\254\247\377" \
-  "\210\244\237\377\204o\221\212\377\3u\225\217\377\250\274\270\377\327" \
-  "\340\337\377\352\333\343\342\377\4\226\246\243\377Slg\377h\177z\377\321" \
-  "\333\331\377\217\333\343\342\377\1\270\305\303\377\202Slg\377\350\333" \
-  "\343\342\377\2\264\305\302\377q\223\214\377\202o\221\212\377\5q\223\214" \
-  "\377\233\263\256\377\300\317\314\377\331\342\340\377\273\312\307\377" \
-  "\204\223\254\247\377\5\225\255\250\377\330\341\337\377\321\333\332\377" \
-  "\261\303\277\377\206\243\235\377\203o\221\212\377\2\205\242\234\377\317" \
-  "\332\331\377\352\333\343\342\377\4\230\250\245\377Tmh\377q\206\202\377" \
-  "\276\311\307\377\216\333\343\342\377\1\270\305\303\377\202Slg\377\346" \
-  "\333\343\342\377\2\332\342\341\377\241\267\263\377\203o\221\212\377\2" \
-  "\227\257\253\377\315\331\327\377\203\333\343\342\377\1\321\333\332\377" \
-  "\204\262\303\300\377\1\272\312\307\377\204\333\343\342\377\2\270\310" \
-  "\306\377\177\235\227\377\202o\221\212\377\2z\231\222\377\304\322\320" \
-  "\377\347\333\343\342\377\1\317\330\327\377\202\301\314\312\377\10\247" \
-  "\266\263\377^vq\377Slg\377o\204\200\377\232\252\247\377\247\266\263\377" \
-  "\264\301\277\377\277\313\311\377\211\301\314\312\377\1\245\264\261\377" \
-  "\202Slg\377\346\333\343\342\377\1\236\265\260\377\202o\221\212\377\2" \
-  "t\225\216\377\273\313\310\377\220\333\343\342\377\2\327\340\337\377\225" \
-  "\256\251\377\202o\221\212\377\2t\225\216\377\310\325\323\377\346\333" \
-  "\343\342\377\1\233\253\250\377\226Slg\377\345\333\343\342\377\1\261\303" \
-  "\277\377\202o\221\212\377\2|\233\225\377\311\325\323\377\223\333\343" \
-  "\342\377\1\247\273\267\377\202o\221\212\377\2|\233\225\377\322\334\333" \
-  "\377\345\333\343\342\377\1\233\253\250\377\226Slg\377\344\333\343\342" \
-  "\377\5\304\321\317\377q\222\213\377o\221\212\377u\226\217\377\312\326" \
-  "\324\377\225\333\343\342\377\1\242\270\264\377\202o\221\212\377\2\211" \
-  "\244\237\377\332\342\341\377\344\333\343\342\377\1\233\253\250\377\226" \
-  "Slg\377\344\333\343\342\377\4\207\243\236\377o\221\212\377p\222\213\377" \
-  "\275\314\312\377\226\333\343\342\377\2\332\342\341\377\220\252\245\377" \
-  "\202o\221\212\377\1\264\305\302\377\344\333\343\342\377\3\233\253\250" \
-  "\377Slg\377\\so\377\221x\215\211\377\1o\204\200\377\202Slg\377\343\333" \
-  "\343\342\377\1\267\310\305\377\202o\221\212\377\1\237\265\261\377\230" \
-  "\333\343\342\377\5\324\336\334\377v\226\220\377o\221\212\377|\233\225" \
-  "\377\330\341\337\377\343\333\343\342\377\3\233\253\250\377Slg\377t\211" \
-  "\205\377\221\333\343\342\377\1\270\305\303\377\202Slg\377\342\333\343" \
-  "\342\377\5\332\342\341\377~\234\226\377o\221\212\377t\225\216\377\322" \
-  "\334\333\377\231\333\343\342\377\1\251\275\271\377\202o\221\212\377\1" \
-  "\255\300\275\377\343\333\343\342\377\3\233\253\250\377Slg\377t\211\205" \
-  "\377\221\333\343\342\377\1\270\305\303\377\202Slg\377\342\333\343\342" \
-  "\377\1\304\321\317\377\202o\221\212\377\1\245\272\266\377\232\333\343" \
-  "\342\377\4\327\340\337\377y\231\222\377o\221\212\377\207\243\236\377" \
-  "\343\333\343\342\377\3\233\253\250\377Slg\377t\211\205\377\221\333\343" \
-  "\342\377\1\270\305\303\377\202Slg\377\342\333\343\342\377\1\243\270\264" \
-  "\377\202o\221\212\377\1\314\327\325\377\233\333\343\342\377\1\234\263" \
-  "\257\377\202o\221\212\377\1\321\333\332\377\342\333\343\342\377\3\277" \
-  "\312\310\377\237\256\253\377\256\273\271\377\221\333\343\342\377\1\323" \
-  "\334\333\377\202\275\310\306\377\342\333\343\342\377\3\202\237\231\377" \
-  "o\221\212\377\201\236\230\377\234\333\343\342\377\1\276\315\312\377\202" \
-  "o\221\212\377\1\261\303\300\377\377\333\343\342\377\333\333\343\342\377" \
-  "\1\330\341\340\377\202o\221\212\377\1\234\263\256\377\234\333\343\342" \
-  "\377\1\330\341\337\377\202o\221\212\377\1\234\263\257\377\377\333\343" \
-  "\342\377\333\333\343\342\377\1\317\332\330\377\202o\221\212\377\1\250" \
-  "\274\270\377\235\333\343\342\377\3y\230\222\377o\221\212\377\222\254" \
-  "\246\377\377\333\343\342\377\333\333\343\342\377\1\304\322\320\377\202" \
-  "o\221\212\377\1\264\306\302\377\235\333\343\342\377\3\205\242\234\377" \
-  "o\221\212\377\207\243\236\377\350\333\343\342\377\13\327\340\337\377" \
-  "\267\303\301\377\225\246\243\377{\217\213\377p\205\201\377f}x\377k\201" \
-  "}\377u\211\205\377\205\227\224\377\245\263\261\377\310\323\321\377\347" \
-  "\333\343\342\377\1\275\314\312\377\202o\221\212\377\1\274\314\311\377" \
-  "\235\333\343\342\377\3\215\250\242\377o\221\212\377\200\236\230\377\346" \
-  "\333\343\342\377\3\324\334\333\377\231\251\246\377_wr\377\212Slg\377" \
-  "\2x\215\211\377\270\304\302\377\345\333\343\342\377\1\306\323\321\377" \
-  "\202o\221\212\377\1\263\304\301\377\235\333\343\342\377\3\203\240\232" \
-  "\377o\221\212\377\211\244\237\377\345\333\343\342\377\2\300\314\312\377" \
-  "f|x\377\216Slg\377\2\216\240\235\377\330\340\337\377\343\333\343\342" \
-  "\377\1\320\333\331\377\202o\221\212\377\1\247\273\267\377\235\333\343" \
-  "\342\377\3w\227\221\377o\221\212\377\223\254\250\377\344\333\343\342" \
-  "\377\2\273\307\305\377Woj\377\220Slg\377\2y\216\212\377\330\341\340\377" \
-  "\342\333\343\342\377\4\331\342\340\377p\221\213\377o\221\212\377\231" \
-  "\261\254\377\234\333\343\342\377\1\326\337\336\377\202o\221\212\377\1" \
-  "\236\265\260\377\331\333\343\342\377\3\272\306\304\377\231\251\246\377" \
-  "\310\322\321\377\207\333\343\342\377\2\310\322\321\377\\to\377\205Sl" \
-  "g\377\7Woj\377dzv\377q\206\202\377}\221\215\377w\214\210\377k\201|\377" \
-  "]up\377\206Slg\377\1\211\233\230\377\343\333\343\342\377\3\206\242\234" \
-  "\377o\221\212\377|\233\225\377\234\333\343\342\377\1\271\311\306\377" \
-  "\202o\221\212\377\1\265\306\303\377\330\333\343\342\377\1\222\243\240" \
-  "\377\203Slg\377\1\271\306\304\377\206\333\343\342\377\1|\217\214\377" \
-  "\203Slg\377\3dzv\377\231\252\247\377\314\326\324\377\207\333\343\342" \
-  "\377\4\330\340\337\377\267\304\302\377\201\224\220\377Vni\377\203Slg" \
-  "\377\1\274\307\306\377\342\333\343\342\377\1\247\274\270\377\202o\221" \
-  "\212\377\1\307\323\321\377\233\333\343\342\377\4\227\257\253\377o\221" \
-  "\212\377q\222\213\377\324\336\334\377\327\333\343\342\377\2\325\335\334" \
-  "\377Zrm\377\203Slg\377\1\205\227\224\377\205\333\343\342\377\1\275\310" \
-  "\306\377\202Slg\377\3Umh\377\251\270\265\377\331\342\341\377\214\333" \
-  "\343\342\377\2\317\331\327\377y\216\212\377\202Slg\377\1t\211\205\377" \
-  "\342\333\343\342\377\1\310\325\323\377\202o\221\212\377\1\237\265\261" \
-  "\377\232\333\343\342\377\4\325\336\335\377v\226\217\377o\221\212\377" \
-  "\213\246\241\377\330\333\343\342\377\2\331\341\340\377czu\377\203Slg" \
-  "\377\1\221\243\237\377\205\333\343\342\377\4\220\241\236\377Slg\377T" \
-  "lg\377\253\271\267\377\217\333\343\342\377\2\326\336\335\377s\210\204" \
-  "\377\202Slg\377\1\317\331\327\377\342\333\343\342\377\4\203\240\232\377" \
-  "o\221\212\377r\223\214\377\317\331\330\377\205\333\343\342\377\2\305" \
-  "\322\320\377\322\334\332\377\212\333\343\342\377\3\332\342\341\377\305" \
-  "\322\320\377\322\334\333\377\205\333\343\342\377\1\243\270\264\377\202" \
-  "o\221\212\377\1\262\304\301\377\331\333\343\342\377\5\250\266\264\377" \
-  "Yql\377Slg\377f|x\377\310\322\321\377\205\333\343\342\377\3k\201}\377" \
-  "Slg\377\212\234\231\377\221\333\343\342\377\4\321\332\331\377Tmh\377" \
-  "Slg\377\253\271\267\377\342\333\343\342\377\1\276\315\312\377\202o\221" \
-  "\212\377\1\227\257\253\377\204\333\343\342\377\6\327\340\337\377\227" \
-  "\257\252\377\223\254\247\377\251\275\271\377\307\324\322\377\332\342" \
-  "\341\377\205\333\343\342\377\5\325\337\335\377\272\311\307\377\234\263" \
-  "\256\377\223\254\247\377\263\304\301\377\204\333\343\342\377\5\317\332" \
-  "\331\377s\224\215\377o\221\212\377\201\236\230\377\331\342\340\377\332" \
-  "\333\343\342\377\3\324\334\333\377\274\307\306\377\332\342\341\377\206" \
-  "\333\343\342\377\3Xql\377Slg\377\255\272\270\377\222\333\343\342\377" \
-  "\3m\202~\377Slg\377\230\251\246\377\343\333\343\342\377\1\216\250\243" \
-  "\377\202o\221\212\377\1\264\305\302\377\203\333\343\342\377\3\275\314" \
-  "\312\377\223\254\247\377\225\255\250\377\202\223\254\247\377\7\236\264" \
-  "\260\377\273\313\310\377\327\337\336\377\333\343\342\377\315\330\326" \
-  "\377\256\301\275\377\225\255\251\377\202\223\254\247\377\3\224\254\250" \
-  "\377\227\257\252\377\330\341\337\377\202\333\343\342\377\2\330\341\337" \
-  "\377\207\243\236\377\202o\221\212\377\1\273\312\310\377\343\333\343\342" \
-  "\377\1\324\335\334\377\202Slg\377\1\314\326\324\377\222\333\343\342\377" \
-  "\3\214\236\233\377Slg\377\214\235\232\377\343\333\343\342\377\5\312\326" \
-  "\324\377t\225\216\377o\221\212\377q\223\214\377\303\320\316\377\202\333" \
-  "\343\342\377\5\237\265\261\377\223\254\247\377\347\355\354\377\335\344" \
-  "\343\377\257\301\276\377\202\223\254\247\377\2\250\274\270\377\321\334" \
-  "\332\377\202\223\254\247\377\6\231\261\254\377\303\321\316\377\360\363" \
-  "\363\377\271\311\306\377\223\254\247\377\277\315\313\377\202\333\343" \
-  "\342\377\1\227\257\252\377\202o\221\212\377\1\222\254\246\377\344\333" \
-  "\343\342\377\1\325\335\334\377\202Slg\377\1\313\325\323\377\222\333\343" \
-  "\342\377\3\213\235\231\377Slg\377\214\236\233\377\344\333\343\342\377" \
-  "\1\273\312\310\377\202o\221\212\377\5v\226\220\377\277\316\313\377\311" \
-  "\325\323\377\223\254\247\377\251\275\271\377\203\377\377\377\377\7\355" \
-  "\361\360\377\227\257\253\377\226\256\251\377\273\312\307\377\223\254" \
-  "\247\377\271\311\306\377\372\373\373\377\202\377\377\377\377\5\346\354" \
-  "\353\377\223\254\247\377\240\266\262\377\330\341\340\377\232\261\255" \
-  "\377\202o\221\212\377\2\203\240\232\377\326\337\336\377\334\333\343\342" \
-  "\377\3\322\333\332\377\267\303\301\377\331\341\340\377\206\333\343\342" \
-  "\377\3Yql\377Slg\377\253\271\267\377\222\333\343\342\377\3k\201}\377" \
-  "Slg\377\231\251\246\377\345\333\343\342\377\1\252\276\272\377\202o\221" \
-  "\212\377\4p\222\213\377\234\263\256\377\223\254\247\377\327\340\336\377" \
-  "\203\377\377\377\377\2\344\352\351\377\232\261\254\377\202\223\254\247" \
-  "\377\3\224\255\250\377\262\303\300\377\371\372\372\377\203\377\377\377" \
-  "\377\3\250\274\270\377\223\254\247\377\214\246\241\377\202o\221\212\377" \
-  "\2y\231\222\377\317\331\330\377\334\333\343\342\377\5\247\266\263\377" \
-  "Xql\377Slg\377`ws\377\305\320\316\377\205\333\343\342\377\3l\201}\377" \
-  "Slg\377\210\233\227\377\221\333\343\342\377\4\317\331\327\377Tlg\377" \
-  "Slg\377\254\271\267\377\346\333\343\342\377\6\257\301\276\377p\222\213" \
-  "\377r\223\214\377\222\253\246\377\233\262\256\377\374\374\374\377\202" \
-  "\377\377\377\377\11\316\331\327\377\223\254\247\377\252\275\272\377\320" \
-  "\333\331\377\332\343\341\377\305\323\320\377\227\257\253\377\237\265" \
-  "\261\377\362\365\364\377\202\377\377\377\377\6\325\337\335\377\223\254" \
-  "\247\377\206\242\234\377o\221\212\377\202\237\231\377\315\330\326\377" \
-  "\334\333\343\342\377\2\331\341\340\377czu\377\203Slg\377\1\217\241\235" \
-  "\377\205\333\343\342\377\1\221\243\237\377\202Slg\377\1\251\267\265\377" \
-  "\217\333\343\342\377\5\325\335\334\377p\206\202\377Slg\377Tlg\377\320" \
-  "\331\330\377\347\333\343\342\377\4\277\316\313\377\204\241\233\377\223" \
-  "\254\247\377\306\323\320\377\202\377\377\377\377\4\352\357\356\377\225" \
-  "\255\250\377\300\317\314\377\376\376\376\377\203\377\377\377\377\12\361" \
-  "\364\363\377\236\264\260\377\257\302\276\377\376\376\376\377\377\377" \
-  "\377\377\373\374\373\377\232\261\254\377\222\253\246\377\217\251\244" \
-  "\377\325\337\335\377\335\333\343\342\377\2\325\336\335\377[sn\377\203" \
-  "Slg\377\1\206\231\225\377\205\333\343\342\377\1\276\312\310\377\202S" \
-  "lg\377\3Umh\377\251\267\265\377\331\342\341\377\214\333\343\342\377\2" \
-  "\315\326\325\377v\213\207\377\202Slg\377\1v\213\207\377\350\333\343\342" \
-  "\377\4\331\341\340\377\230\260\253\377\224\254\247\377\362\365\364\377" \
-  "\202\377\377\377\377\3\272\312\307\377\243\270\264\377\374\375\375\377" \
-  "\205\377\377\377\377\3\335\345\343\377\223\254\247\377\352\357\356\377" \
-  "\202\377\377\377\377\3\304\321\317\377\223\254\247\377\267\307\304\377" \
-  "\337\333\343\342\377\1\223\244\240\377\202Slg\377\2Umh\377\275\310\306" \
-  "\377\206\333\343\342\377\1~\222\216\377\203Slg\377\4czu\377\227\247\244" \
-  "\377\310\322\321\377\331\341\340\377\206\333\343\342\377\4\325\335\334" \
-  "\377\263\300\276\377}\220\215\377Tmh\377\203Slg\377\1\277\312\310\377" \
-  "\350\333\343\342\377\3\302\320\315\377\223\254\247\377\264\305\302\377" \
-  "\203\377\377\377\377\2\243\271\264\377\277\316\313\377\206\377\377\377" \
-  "\377\3\373\374\373\377\224\255\250\377\322\335\333\377\202\377\377\377" \
-  "\377\4\360\363\363\377\223\254\247\377\232\262\255\377\332\342\341\377" \
-  "\337\333\343\342\377\3\274\310\306\377\236\255\253\377\315\327\325\377" \
-  "\207\333\343\342\377\2\311\324\322\377^uq\377\205Slg\377\7Tmh\377_wr" \
-  "\377m\202~\377y\215\211\377s\210\204\377f}x\377Yql\377\206Slg\377\1\217" \
-  "\240\235\377\351\333\343\342\377\3\244\271\265\377\223\254\247\377\342" \
-  "\350\347\377\203\377\377\377\377\2\240\266\262\377\302\320\315\377\206" \
-  "\377\377\377\377\3\374\375\375\377\225\255\251\377\317\332\330\377\203" \
-  "\377\377\377\377\3\262\304\300\377\223\254\247\377\303\321\317\377\352" \
-  "\333\343\342\377\2\275\311\307\377Xql\377\220Slg\377\2}\221\215\377\331" \
-  "\342\341\377\350\333\343\342\377\4\316\331\327\377\223\254\247\377\243" \
-  "\270\264\377\376\376\376\377\203\377\377\377\377\2\267\307\304\377\250" \
-  "\274\270\377\206\377\377\377\377\3\345\353\351\377\223\254\247\377\346" \
-  "\354\353\377\203\377\377\377\377\3\340\347\345\377\223\254\247\377\245" \
-  "\272\266\377\353\333\343\342\377\2\303\316\314\377h\177z\377\215Slg\377" \
-  "\3Tlg\377\225\245\242\377\331\341\340\377\351\333\343\342\377\3\257\302" \
-  "\276\377\223\254\247\377\320\333\331\377\204\377\377\377\377\3\340\347" \
-  "\346\377\223\254\247\377\317\332\330\377\204\377\377\377\377\4\371\372" \
-  "\372\377\245\272\266\377\246\272\266\377\374\375\375\377\203\377\377" \
-  "\377\377\4\376\376\376\377\242\267\263\377\223\254\247\377\317\331\330" \
-  "\377\353\333\343\342\377\3\325\335\334\377\235\255\252\377czu\377\211" \
-  "Slg\377\3Tlg\377\177\222\217\377\277\312\310\377\352\333\343\342\377" \
-  "\4\326\337\336\377\225\256\251\377\227\257\253\377\371\372\372\377\205" \
-  "\377\377\377\377\11\277\316\313\377\223\254\247\377\272\312\307\377\341" \
-  "\350\346\377\353\360\357\377\326\340\336\377\240\266\261\377\227\257" \
-  "\252\377\352\357\356\377\205\377\377\377\377\3\316\331\327\377\223\254" \
-  "\247\377\260\302\277\377\355\333\343\342\377\13\330\341\340\377\273\307" \
-  "\305\377\231\252\247\377\177\222\217\377t\211\205\377k\201|\377o\205" \
-  "\201\377y\215\211\377\211\233\230\377\251\267\265\377\314\326\324\377" \
-  "\354\333\343\342\377\3\273\312\310\377\223\254\247\377\277\316\313\377" \
-  "\207\377\377\377\377\2\315\330\327\377\224\255\250\377\203\223\254\247" \
-  "\377\2\235\263\257\377\360\363\362\377\206\377\377\377\377\4\370\371" \
-  "\371\377\227\257\252\377\226\256\252\377\327\340\336\377\377\333\343" \
-  "\342\377\343\333\343\342\377\4\332\342\341\377\235\263\257\377\223\254" \
-  "\247\377\354\361\360\377\207\377\377\377\377\7\310\325\322\377\223\254" \
-  "\247\377\262\303\300\377\307\323\321\377\231\260\253\377\225\255\251" \
-  "\377\365\367\367\377\207\377\377\377\377\3\275\314\311\377\223\254\247" \
-  "\377\274\313\311\377\346\333\343\342\377\1\316\327\326\377\205\301\314" \
-  "\312\377\1\327\340\337\377\365\333\343\342\377\3\306\323\321\377\223" \
-  "\254\247\377\256\300\275\377\207\377\377\377\377\10\374\375\375\377\235" \
-  "\264\257\377\224\255\250\377\324\336\334\377\333\343\342\377\266\307" \
-  "\304\377\223\254\247\377\312\326\324\377\207\377\377\377\377\3\353\357" \
-  "\356\377\223\254\247\377\236\264\260\377\346\333\343\342\377\1\204\227" \
-  "\223\377\205Slg\377\1\311\324\322\377\365\333\343\342\377\3\250\274\270" \
-  "\377\223\254\247\377\335\345\344\377\207\377\377\377\377\3\332\342\340" \
-  "\377\223\254\247\377\254\277\274\377\202\333\343\342\377\4\323\335\334" \
-  "\377\224\255\250\377\236\265\260\377\375\376\375\377\207\377\377\377" \
-  "\377\3\256\301\275\377\223\254\247\377\310\324\322\377\345\333\343\342" \
-  "\377\1i\177{\377\205Slg\377\1\311\324\322\377\364\333\343\342\377\4\321" \
-  "\334\332\377\223\254\247\377\240\265\261\377\376\376\376\377\207\377" \
-  "\377\377\377\3\254\277\274\377\223\254\247\377\312\326\324\377\203\333" \
-  "\343\342\377\3\253\276\272\377\223\254\247\377\334\344\342\377\207\377" \
-  "\377\377\377\3\333\343\342\377\223\254\247\377\251\275\271\377\345\333" \
-  "\343\342\377\1Vni\377\202Slg\377\4Yrm\377\234\253\251\377\302\315\313" \
-  "\377\331\342\341\377\364\333\343\342\377\3\264\305\302\377\223\254\247" \
-  "\377\314\330\325\377\207\377\377\377\377\3\353\360\357\377\223\254\247" \
-  "\377\241\266\262\377\204\333\343\342\377\3\311\325\323\377\223\254\247" \
-  "\377\256\301\275\377\207\377\377\377\377\4\375\375\375\377\236\265\260" \
-  "\377\223\254\247\377\322\334\333\377\343\333\343\342\377\1\324\334\333" \
-  "\377\203Slg\377\1\261\277\274\377\366\333\343\342\377\4\330\341\340\377" \
-  "\230\260\253\377\225\256\251\377\366\370\370\377\207\377\377\377\377" \
-  "\3\276\315\312\377\223\254\247\377\277\315\313\377\205\333\343\342\377" \
-  "\3\237\265\261\377\223\254\247\377\355\361\360\377\207\377\377\377\377" \
-  "\3\312\326\324\377\223\254\247\377\265\306\303\377\343\333\343\342\377" \
-  "\1\326\337\336\377\202Slg\377\1]up\377\367\333\343\342\377\3\277\316" \
-  "\313\377\223\254\247\377\272\312\307\377\207\377\377\377\377\4\370\371" \
-  "\371\377\227\257\252\377\230\257\253\377\330\341\337\377\205\333\343" \
-  "\342\377\3\275\314\312\377\223\254\247\377\277\316\313\377\207\377\377" \
-  "\377\377\4\365\367\367\377\225\255\251\377\231\260\254\377\331\341\340" \
-  "\377\343\333\343\342\377\3`ws\377Slg\377i\200{\377\367\333\343\342\377" \
-  "\3\241\267\263\377\223\254\247\377\350\355\354\377\207\377\377\377\377" \
-  "\3\317\332\330\377\223\254\247\377\263\305\301\377\206\333\343\342\377" \
-  "\4\327\340\337\377\227\257\252\377\230\260\253\377\371\372\372\377\207" \
-  "\377\377\377\377\3\271\311\306\377\223\254\247\377\301\317\314\377\343" \
-  "\333\343\342\377\4y\215\211\377Slg\377Vni\377\327\340\337\377\220\333" \
-  "\343\342\377\1\324\335\334\377\202\301\314\312\377\342\333\343\342\377" \
-  "\3\313\327\325\377\223\254\247\377\251\275\271\377\207\377\377\377\377" \
-  "\4\376\376\376\377\242\267\263\377\223\254\247\377\321\333\332\377\207" \
-  "\333\343\342\377\3\262\303\300\377\223\254\247\377\321\334\332\377\207" \
-  "\377\377\377\377\3\346\354\352\377\223\254\247\377\242\270\263\377\343" \
-  "\333\343\342\377\1\260\276\273\377\202Slg\377\1\300\313\311\377\220\333" \
-  "\343\342\377\1\270\305\303\377\202Slg\377\342\333\343\342\377\3\255\300" \
-  "\274\377\223\254\247\377\327\340\336\377\207\377\377\377\377\3\340\347" \
-  "\346\377\223\254\247\377\247\273\270\377\210\333\343\342\377\3\320\332" \
-  "\331\377\223\254\247\377\244\271\265\377\210\377\377\377\377\3\247\273" \
-  "\267\377\223\254\247\377\314\330\326\377\342\333\343\342\377\5\331\342" \
-  "\341\377o\205\201\377Slg\377x\215\211\377\331\342\341\377\217\333\343" \
-  "\342\377\1\270\305\303\377\202Slg\377\341\333\343\342\377\4\325\336\335" \
-  "\377\225\255\250\377\233\262\255\377\374\374\374\377\207\377\377\377" \
-  "\377\3\263\305\301\377\223\254\247\377\306\323\321\377\211\333\343\342" \
-  "\377\3\246\273\267\377\223\254\247\377\343\351\350\377\207\377\377\377" \
-  "\377\3\325\336\334\377\223\254\247\377\256\300\275\377\343\333\343\342" \
-  "\377\5\316\330\326\377dzv\377Slg\377\220\241\236\377\332\342\341\377" \
-  "\216\333\343\342\377\1\270\305\303\377\202Slg\377\341\333\343\342\377" \
-  "\3\270\310\306\377\223\254\247\377\305\323\320\377\207\377\377\377\377" \
-  "\4\361\364\363\377\223\254\247\377\234\263\257\377\332\342\341\377\211" \
-  "\333\343\342\377\3\304\322\317\377\223\254\247\377\265\306\302\377\207" \
-  "\377\377\377\377\4\373\374\373\377\232\261\254\377\225\255\251\377\325" \
-  "\337\335\377\343\333\343\342\377\6\316\327\326\377\200\224\220\377Sl" \
-  "g\377h~z\377\246\265\262\377\326\336\335\377\214\333\343\342\377\1\270" \
-  "\305\303\377\202Slg\377\340\333\343\342\377\4\332\342\341\377\233\262" \
-  "\255\377\223\254\247\377\361\364\364\377\207\377\377\377\377\3\304\322" \
-  "\317\377\223\254\247\377\272\312\307\377\212\333\343\342\377\4\332\342" \
-  "\341\377\233\262\256\377\224\254\247\377\362\365\364\377\207\377\377" \
-  "\377\377\3\303\321\316\377\223\254\247\377\272\311\307\377\341\333\343" \
-  "\342\377\1\257\274\272\377\203}\220\215\377\1^vq\377\203Slg\377\3^vq" \
-  "\377n\203\177\377{\217\213\377\211}\220\215\377\1r\207\203\377\202Sl" \
-  "g\377\340\333\343\342\377\3\304\321\317\377\223\254\247\377\264\305\301" \
-  "\377\207\377\377\377\377\4\373\374\374\377\232\262\255\377\225\256\251" \
-  "\377\326\337\336\377\213\333\343\342\377\3\271\311\306\377\223\254\247" \
-  "\377\307\324\321\377\207\377\377\377\377\4\360\363\362\377\223\254\247" \
-  "\377\234\263\256\377\332\342\341\377\340\333\343\342\377\1\233\253\250" \
-  "\377\226Slg\377\340\333\343\342\377\3\246\272\266\377\223\254\247\377" \
-  "\341\350\347\377\207\377\377\377\377\3\326\337\335\377\223\254\247\377" \
-  "\256\301\275\377\214\333\343\342\377\4\325\336\335\377\225\255\250\377" \
-  "\234\263\256\377\374\375\374\377\207\377\377\377\377\3\262\304\300\377" \
-  "\223\254\247\377\305\322\320\377\340\333\343\342\377\1\233\253\250\377" \
-  "\226Slg\377\337\333\343\342\377\4\317\332\330\377\223\254\247\377\242" \
-  "\270\263\377\376\376\376\377\207\377\377\377\377\3\251\274\270\377\223" \
-  "\254\247\377\315\330\326\377\215\333\343\342\377\3\255\300\274\377\223" \
-  "\254\247\377\330\341\337\377\207\377\377\377\377\3\337\346\345\377\223" \
-  "\254\247\377\247\273\267\377\340\333\343\342\377\1\233\253\250\377\226" \
-  "Slg\377\337\333\343\342\377\3\261\303\300\377\223\254\247\377\320\333" \
-  "\331\377\207\377\377\377\377\3\347\355\354\377\223\254\247\377\243\270" \
-  "\264\377\216\333\343\342\377\3\314\327\325\377\223\254\247\377\252\276" \
-  "\272\377\207\377\377\377\377\4\376\376\376\377\241\267\262\377\223\254" \
-  "\247\377\320\333\331\377\337\333\343\342\377\3\233\253\250\377Slg\377" \
-  "m\202~\377\221\275\310\306\377\1\242\261\256\377\202Slg\377\336\333\343" \
-  "\342\377\1\327\340\337\377\202\227\257\252\377\1\370\372\371\377\207" \
-  "\377\377\377\377\3\272\312\307\377\223\254\247\377\301\317\315\377\217" \
-  "\333\343\342\377\3\241\267\263\377\223\254\247\377\351\356\355\377\207" \
-  "\377\377\377\377\3\316\331\327\377\223\254\247\377\263\304\301\377\337" \
-  "\333\343\342\377\3\233\253\250\377Slg\377t\211\205\377\221\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\336\333\343\342\377\3\275\314\311\377" \
-  "\223\254\247\377\277\315\312\377\207\377\377\377\377\4\366\370\367\377" \
-  "\225\256\251\377\231\260\254\377\331\341\340\377\217\333\343\342\377" \
-  "\3\300\316\314\377\223\254\247\377\274\313\310\377\207\377\377\377\377" \
-  "\4\367\371\371\377\226\256\252\377\227\257\252\377\330\340\337\377\336" \
-  "\333\343\342\377\3\233\253\250\377Slg\377t\211\205\377\221\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\336\333\343\342\377\3\237\265\260\377" \
-  "\223\254\247\377\354\360\357\377\207\377\377\377\377\3\313\327\325\377" \
-  "\223\254\247\377\266\306\303\377\220\333\343\342\377\4\331\341\340\377" \
-  "\230\260\253\377\226\256\252\377\367\371\370\377\207\377\377\377\377" \
-  "\3\274\314\311\377\223\254\247\377\276\315\312\377\336\333\343\342\377" \
-  "\3\237\256\253\377[sn\377{\217\213\377\221\333\343\342\377\1\302\315" \
-  "\313\377\202x\215\211\377\335\333\343\342\377\3\310\325\323\377\223\254" \
-  "\247\377\255\300\274\377\207\377\377\377\377\4\375\376\375\377\237\265" \
-  "\261\377\224\254\247\377\323\334\333\377\221\333\343\342\377\3\264\305" \
-  "\302\377\223\254\247\377\315\331\326\377\207\377\377\377\377\3\352\357" \
-  "\356\377\223\254\247\377\240\266\261\377\377\333\343\342\377\323\333" \
-  "\343\342\377\3\252\276\272\377\223\254\247\377\333\343\341\377\207\377" \
-  "\377\377\377\3\335\344\343\377\223\254\247\377\252\275\272\377\222\333" \
-  "\343\342\377\4\322\334\332\377\223\254\247\377\241\266\262\377\376\376" \
-  "\376\377\207\377\377\377\377\3\253\276\273\377\223\254\247\377\312\326" \
-  "\324\377\356\333\343\342\377\1\331\342\341\377\341\333\343\342\377\4" \
-  "\323\335\333\377\224\254\247\377\235\264\257\377\375\375\375\377\207" \
-  "\377\377\377\377\3\257\302\276\377\223\254\247\377\310\324\322\377\207" \
-  "\333\343\342\377\4\327\340\337\377\264\305\302\377\260\302\277\377\305" \
-  "\321\317\377\210\333\343\342\377\3\251\274\271\377\223\254\247\377\337" \
-  "\346\345\377\207\377\377\377\377\3\330\341\337\377\223\254\247\377\253" \
-  "\276\273\377\356\333\343\342\377\5\264\301\277\377^uq\377w\214\210\377" \
-  "\236\255\253\377\330\341\340\377\335\333\343\342\377\3\266\306\303\377" \
-  "\223\254\247\377\311\325\323\377\207\377\377\377\377\3\356\362\361\377" \
-  "\223\254\247\377\236\265\260\377\210\333\343\342\377\5\251\275\272\377" \
-  "\226\256\251\377\240\266\261\377\222\253\246\377\316\331\330\377\207" \
-  "\333\343\342\377\3\307\323\321\377\223\254\247\377\261\303\300\377\207" \
-  "\377\377\377\377\4\374\375\374\377\234\263\256\377\224\255\250\377\324" \
-  "\335\334\377\334\333\343\342\377\3\241\260\255\377_vr\377z\216\212\377" \
-  "\216\333\343\342\377\1\264\301\277\377\203Slg\377\2m\202~\377\312\324" \
-  "\323\377\333\333\343\342\377\4\331\341\340\377\231\261\254\377\225\255" \
-  "\250\377\364\367\366\377\207\377\377\377\377\3\301\317\314\377\223\254" \
-  "\247\377\275\314\311\377\207\333\343\342\377\6\331\342\341\377\225\255" \
-  "\250\377\320\333\331\377\374\375\375\377\234\263\256\377\261\303\300" \
-  "\377\207\333\343\342\377\4\332\342\341\377\235\264\257\377\223\254\247" \
-  "\377\360\363\362\377\207\377\377\377\377\3\307\324\321\377\223\254\247" \
-  "\377\267\310\305\377\334\333\343\342\377\3\233\253\250\377Slg\377p\205" \
-  "\201\377\216\333\343\342\377\2\270\305\303\377Woj\377\203Slg\377\1~\221" \
-  "\216\377\333\333\343\342\377\3\301\317\315\377\223\254\247\377\270\310" \
-  "\305\377\207\377\377\377\377\4\371\373\372\377\230\260\253\377\226\256" \
-  "\252\377\327\340\336\377\207\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\210\333\343\342\377\3\273\313\310\377\223\254\247\377\303\321\316" \
-  "\377\207\377\377\377\377\4\363\365\365\377\224\255\250\377\232\261\255" \
-  "\377\331\342\341\377\333\333\343\342\377\3\233\253\250\377Slg\377p\205" \
-  "\201\377\217\333\343\342\377\3\332\342\341\377\306\321\317\377\206\230" \
-  "\225\377\202Slg\377\1\300\313\311\377\332\333\343\342\377\3\243\270\264" \
-  "\377\223\254\247\377\345\353\352\377\207\377\377\377\377\3\322\335\333" \
-  "\377\223\254\247\377\261\303\277\377\210\333\343\342\377\6\331\340\337" \
-  "\377\223\254\247\377\332\342\341\377\377\377\377\377\251\275\271\377" \
-  "\255\300\275\377\210\333\343\342\377\4\326\337\336\377\226\256\251\377" \
-  "\232\261\254\377\372\373\373\377\207\377\377\377\377\3\266\307\303\377" \
-  "\223\254\247\377\303\320\316\377\333\333\343\342\377\3\233\253\250\377" \
-  "Slg\377p\205\201\377\221\333\343\342\377\4\332\342\341\377q\207\202\377" \
-  "Slg\377\246\264\262\377\331\333\343\342\377\3\315\330\326\377\223\254" \
-  "\247\377\246\273\267\377\210\377\377\377\377\3\245\272\266\377\223\254" \
-  "\247\377\317\332\330\377\210\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\211\333\343\342\377\3\260\302\276\377\223\254\247\377\324\336\334" \
-  "\377\207\377\377\377\377\3\343\351\350\377\223\254\247\377\244\271\265" \
-  "\377\333\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\222\333" \
-  "\343\342\377\3\223\244\240\377Slg\377\223\244\240\377\331\333\343\342" \
-  "\377\3\257\301\276\377\223\254\247\377\324\336\334\377\207\377\377\377" \
-  "\377\3\344\352\351\377\223\254\247\377\245\272\266\377\211\333\343\342" \
-  "\377\6\331\340\337\377\223\254\247\377\332\342\341\377\377\377\377\377" \
-  "\251\275\271\377\255\300\275\377\211\333\343\342\377\3\316\331\327\377" \
-  "\223\254\247\377\247\273\267\377\210\377\377\377\377\3\244\271\265\377" \
-  "\223\254\247\377\316\331\327\377\332\333\343\342\377\3\233\253\250\377" \
-  "Slg\377p\205\201\377\222\333\343\342\377\3\213\235\232\377Slg\377\214" \
-  "\235\232\377\330\333\343\342\377\10\326\337\336\377\225\256\251\377\231" \
-  "\261\254\377\372\373\373\377\354\360\357\377\301\317\315\377\325\337" \
-  "\335\377\373\374\374\377\203\377\377\377\377\3\266\307\303\377\223\254" \
-  "\247\377\303\321\317\377\211\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\212\333\343\342\377\3\244\271\265\377\223\254\247\377\346\353\352" \
-  "\377\203\377\377\377\377\7\356\362\362\377\303\321\316\377\322\334\332" \
-  "\377\372\373\373\377\322\334\332\377\223\254\247\377\260\302\277\377" \
-  "\332\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\221\333\343" \
-  "\342\377\4\314\325\324\377_wr\377Slg\377\235\254\252\377\306\333\343" \
-  "\342\377\1\203\240\232\377\205r\223\214\377\1w\227\221\377\213\253\276" \
-  "\273\377\16\240\265\262\377\223\254\247\377\302\320\315\377\266\307\304" \
-  "\377\223\254\247\377\233\262\256\377\223\254\247\377\233\262\255\377" \
-  "\346\353\352\377\377\377\377\377\363\366\365\377\224\255\250\377\225" \
-  "\256\251\377\252\275\272\377\211\253\276\273\377\6\252\275\272\377\223" \
-  "\254\247\377\332\342\341\377\377\377\377\377\250\274\270\377\233\262" \
-  "\256\377\212\253\276\273\377\3\242\267\264\377\223\254\247\377\270\310" \
-  "\305\377\202\377\377\377\377\11\275\315\312\377\223\254\247\377\232\262" \
-  "\255\377\224\255\250\377\231\261\254\377\332\344\341\377\230\260\253" \
-  "\377\224\254\250\377\251\275\271\377\212\253\276\273\377\1\227\257\253" \
-  "\377\205r\223\214\377\2s\224\215\377\261\303\300\377\300\333\343\342" \
-  "\377\1\267\304\302\377\206\211\234\230\377\3p\205\201\377Slg\377^vq\377" \
-  "\216\211\234\230\377\4\206\231\225\377\177\223\217\377r\207\203\377T" \
-  "mh\377\202Slg\377\1\257\274\272\377\306\333\343\342\377\1|\233\224\377" \
-  "\221o\221\212\377\15\215\250\242\377\223\254\247\377\335\345\343\377" \
-  "\223\254\247\377\317\332\330\377\375\375\375\377\360\363\363\377\243" \
-  "\270\264\377\265\306\303\377\377\377\377\377\310\325\322\377\223\254" \
-  "\247\377\200\236\227\377\212o\221\212\377\6p\221\212\377\223\254\247" \
-  "\377\332\342\341\377\377\377\377\377\247\273\267\377\205\242\234\377" \
-  "\213o\221\212\377\15\217\251\244\377\224\255\250\377\365\367\367\377" \
-  "\361\364\364\377\224\255\250\377\306\323\321\377\374\375\375\377\363" \
-  "\366\365\377\252\276\272\377\255\300\274\377\300\317\314\377\223\254" \
-  "\247\377~\234\226\377\221o\221\212\377\1\256\301\276\377\300\333\343" \
-  "\342\377\1\237\256\253\377\234Slg\377\2]up\377\321\333\331\377\306\333" \
-  "\343\342\377\1|\233\224\377\220o\221\212\377\6y\230\222\377\223\254\247" \
-  "\377\261\303\277\377\277\316\313\377\235\264\257\377\376\376\376\377" \
-  "\202\377\377\377\377\6\317\332\330\377\224\255\250\377\362\366\365\377" \
-  "\234\263\257\377\222\253\246\377r\223\214\377\212o\221\212\377\6p\221" \
-  "\212\377\223\254\247\377\332\342\341\377\377\377\377\377\247\273\267" \
-  "\377\205\242\234\377\213o\221\212\377\6\201\236\230\377\223\254\247\377" \
-  "\312\326\323\377\310\324\322\377\227\257\252\377\372\373\373\377\202" \
-  "\377\377\377\377\5\331\342\340\377\223\254\247\377\337\346\345\377\223" \
-  "\254\247\377\215\247\242\377\221o\221\212\377\1\256\301\276\377\300\333" \
-  "\343\342\377\1\237\256\253\377\234Slg\377\1\246\265\262\377\307\333\343" \
-  "\342\377\1|\233\224\377\220o\221\212\377\6\210\244\236\377\223\254\247" \
-  "\377\336\346\344\377\320\333\330\377\225\256\251\377\365\367\367\377" \
-  "\202\377\377\377\377\5\275\315\312\377\236\264\260\377\327\341\337\377" \
-  "\223\254\247\377\206\242\234\377\213o\221\212\377\6p\221\212\377\223" \
-  "\254\247\377\332\342\341\377\377\377\377\377\247\273\267\377\205\242" \
-  "\234\377\213o\221\212\377\6r\223\214\377\222\253\246\377\236\264\260" \
-  "\377\327\340\336\377\223\254\247\377\354\360\357\377\202\377\377\377" \
-  "\377\6\310\324\322\377\231\260\253\377\371\373\373\377\257\301\276\377" \
-  "\223\254\247\377x\230\221\377\220o\221\212\377\1\256\301\276\377\300" \
-  "\333\343\342\377\1\237\256\253\377\232Slg\377\2q\207\202\377\267\304" \
-  "\302\377\310\333\343\342\377\1|\233\224\377\217o\221\212\377\16s\224" \
-  "\215\377\222\253\246\377\240\266\262\377\376\376\376\377\371\372\372" \
-  "\377\230\260\253\377\250\274\270\377\326\337\336\377\301\317\315\377" \
-  "\226\256\251\377\310\325\322\377\253\277\273\377\223\254\247\377w\227" \
-  "\220\377\213o\221\212\377\6p\221\212\377\223\254\247\377\332\342\341" \
-  "\377\377\377\377\377\247\273\267\377\205\242\234\377\214o\221\212\377" \
-  "\15\206\242\235\377\223\254\247\377\330\341\340\377\234\263\256\377\245" \
-  "\272\265\377\324\336\334\377\305\322\317\377\230\260\253\377\301\317" \
-  "\314\377\377\377\377\377\334\344\343\377\223\254\247\377\207\243\236" \
-  "\377\220o\221\212\377\1\256\301\276\377\300\333\343\342\377\1\306\321" \
-  "\317\377\206\254\271\267\377\3\202\225\221\377Slg\377f|x\377\216\254" \
-  "\271\267\377\3\263\300\276\377\304\317\315\377\325\335\334\377\312\333" \
-  "\343\342\377\1\255\300\274\377\205\244\271\265\377\1\251\275\271\377" \
-  "\211\333\343\342\377\3\263\305\301\377\223\254\247\377\315\330\326\377" \
-  "\202\377\377\377\377\10\341\350\346\377\257\301\275\377\223\254\247\377" \
-  "\234\263\256\377\306\323\321\377\345\352\351\377\223\254\247\377\241" \
-  "\266\262\377\214\333\343\342\377\6\331\340\337\377\223\254\247\377\332" \
-  "\342\341\377\377\377\377\377\251\275\271\377\255\300\275\377\214\333" \
-  "\343\342\377\16\311\325\323\377\223\254\247\377\256\300\275\377\344\352" \
-  "\351\377\262\304\301\377\223\254\247\377\231\261\254\377\303\321\316" \
-  "\377\365\367\367\377\377\377\377\377\375\376\375\377\237\265\260\377" \
-  "\223\254\247\377\322\334\333\377\210\333\343\342\377\1\310\324\322\377" \
-  "\206\244\271\265\377\1\304\322\320\377\307\333\343\342\377\3\233\253" \
-  "\250\377Slg\377p\205\201\377\352\333\343\342\377\4\330\341\337\377\230" \
-  "\257\253\377\226\256\251\377\366\370\370\377\204\377\377\377\377\6\361" \
-  "\364\363\377\374\375\375\377\377\377\377\377\275\314\311\377\223\254" \
-  "\247\377\277\315\313\377\214\333\343\342\377\6\331\340\337\377\223\254" \
-  "\247\377\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275" \
-  "\377\215\333\343\342\377\6\237\265\261\377\223\254\247\377\354\361\360" \
-  "\377\377\377\377\377\362\365\365\377\372\373\373\377\204\377\377\377" \
-  "\377\3\313\327\324\377\223\254\247\377\265\306\302\377\327\333\343\342" \
-  "\377\3\233\253\250\377Slg\377p\205\201\377\352\333\343\342\377\3\277" \
-  "\315\313\377\223\254\247\377\274\313\310\377\207\377\377\377\377\4\370" \
-  "\371\371\377\227\257\252\377\230\257\253\377\330\341\337\377\214\333" \
-  "\343\342\377\6\331\340\337\377\223\254\247\377\332\342\341\377\377\377" \
-  "\377\377\251\275\271\377\255\300\275\377\215\333\343\342\377\3\275\314" \
-  "\312\377\223\254\247\377\277\316\313\377\207\377\377\377\377\4\366\370" \
-  "\367\377\225\256\251\377\230\260\253\377\331\341\340\377\326\333\343" \
-  "\342\377\3\253\271\266\377t\211\205\377\213\235\231\377\352\333\343\342" \
-  "\377\3\241\266\262\377\223\254\247\377\351\356\355\377\207\377\377\377" \
-  "\377\3\317\332\330\377\223\254\247\377\263\305\301\377\215\333\343\342" \
-  "\377\6\331\340\337\377\223\254\247\377\332\342\341\377\377\377\377\377" \
-  "\251\275\271\377\255\300\275\377\215\333\343\342\377\4\327\340\337\377" \
-  "\227\257\252\377\227\257\253\377\371\372\372\377\207\377\377\377\377" \
-  "\3\271\311\306\377\223\254\247\377\300\316\314\377\377\333\343\342\377" \
-  "\303\333\343\342\377\3\312\326\324\377\223\254\247\377\252\275\271\377" \
-  "\207\377\377\377\377\4\376\376\376\377\242\267\263\377\223\254\247\377" \
-  "\321\333\332\377\215\333\343\342\377\6\331\340\337\377\223\254\247\377" \
-  "\332\342\341\377\377\377\377\377\251\275\271\377\255\300\275\377\216" \
-  "\333\343\342\377\3\262\303\300\377\223\254\247\377\320\333\331\377\207" \
-  "\377\377\377\377\3\347\354\353\377\223\254\247\377\242\267\263\377\377" \
-  "\333\343\342\377\303\333\343\342\377\3\254\277\274\377\223\254\247\377" \
-  "\330\341\337\377\207\377\377\377\377\3\340\347\346\377\223\254\247\377" \
-  "\247\273\270\377\216\333\343\342\377\6\331\340\337\377\223\254\247\377" \
-  "\330\341\337\377\377\377\377\377\250\274\270\377\255\300\275\377\216" \
-  "\333\343\342\377\3\320\332\331\377\223\254\247\377\243\271\264\377\210" \
-  "\377\377\377\377\3\250\274\270\377\223\254\247\377\314\327\325\377\377" \
-  "\333\343\342\377\301\333\343\342\377\4\324\336\334\377\224\255\250\377" \
-  "\233\262\256\377\374\374\374\377\207\377\377\377\377\3\263\304\301\377" \
-  "\223\254\247\377\306\323\321\377\217\333\343\342\377\5\237\265\261\377" \
-  "\252\275\271\377\322\334\332\377\223\254\247\377\275\314\311\377\217" \
-  "\333\343\342\377\3\246\273\267\377\223\254\247\377\342\351\347\377\207" \
-  "\377\377\377\377\3\325\337\335\377\223\254\247\377\256\300\275\377\343" \
-  "\333\343\342\377\6\267\303\301\377\223\244\240\377|\220\214\377\213\235" \
-  "\231\377\250\267\264\377\311\323\322\377\327\333\343\342\377\3\270\310" \
-  "\305\377\223\254\247\377\306\323\321\377\207\377\377\377\377\4\361\364" \
-  "\363\377\223\254\247\377\234\263\257\377\332\342\341\377\217\333\343" \
-  "\342\377\1\307\323\321\377\202\223\254\247\377\2\240\265\261\377\332" \
-  "\342\341\377\217\333\343\342\377\3\304\322\317\377\223\254\247\377\264" \
-  "\306\302\377\207\377\377\377\377\4\373\374\374\377\232\262\255\377\225" \
-  "\255\250\377\325\336\335\377\325\333\343\342\377\1\302\315\313\377\204" \
-  "\222\243\240\377\1\253\271\267\377\205\333\343\342\377\2\323\334\333" \
-  "\377\200\223\220\377\205Slg\377\2Uni\377\247\266\263\377\325\333\343" \
-  "\342\377\4\332\342\341\377\233\262\255\377\224\254\247\377\362\365\364" \
-  "\377\207\377\377\377\377\3\304\322\317\377\223\254\247\377\272\312\307" \
-  "\377\221\333\343\342\377\3\327\337\336\377\326\337\335\377\331\340\337" \
-  "\377\220\333\343\342\377\4\332\342\341\377\233\262\256\377\224\254\247" \
-  "\377\362\365\364\377\207\377\377\377\377\3\304\322\317\377\223\254\247" \
-  "\377\271\311\306\377\325\333\343\342\377\1\211\233\230\377\204Slg\377" \
-  "\1\201\224\220\377\205\333\343\342\377\1\200\223\220\377\210Slg\377\1" \
-  "\227\247\244\377\324\333\343\342\377\3\303\321\317\377\223\254\247\377" \
-  "\265\306\302\377\207\377\377\377\377\4\373\374\374\377\232\261\255\377" \
-  "\225\256\251\377\326\337\336\377\245\333\343\342\377\3\271\311\306\377" \
-  "\223\254\247\377\306\323\320\377\207\377\377\377\377\4\361\364\363\377" \
-  "\223\254\247\377\234\262\256\377\332\342\341\377\323\333\343\342\377" \
-  "\2\330\341\340\377]up\377\203Slg\377\2[sn\377\227\247\244\377\204\333" \
-  "\343\342\377\1\247\266\263\377\212Slg\377\1\305\317\316\377\323\333\343" \
-  "\342\377\3\245\272\266\377\223\254\247\377\342\351\347\377\207\377\377" \
-  "\377\377\3\325\337\335\377\223\254\247\377\256\301\275\377\246\333\343" \
-  "\342\377\4\325\336\335\377\225\255\250\377\233\262\256\377\374\374\374" \
-  "\377\207\377\377\377\377\3\263\304\301\377\223\254\247\377\305\322\320" \
-  "\377\323\333\343\342\377\1\265\302\300\377\202Slg\377\3]up\377\263\300" \
-  "\275\377\332\342\341\377\205\333\343\342\377\1i\177{\377\203Slg\377\5" \
-  "Yrm\377\233\253\250\377\266\302\300\377\246\264\262\377x\214\210\377" \
-  "\202Slg\377\1\204\227\223\377\322\333\343\342\377\3\317\332\330\377\223" \
-  "\254\247\377\243\270\264\377\210\377\377\377\377\3\250\274\270\377\223" \
-  "\254\247\377\315\330\326\377\247\333\343\342\377\3\255\300\274\377\223" \
-  "\254\247\377\330\341\337\377\207\377\377\377\377\3\340\347\346\377\223" \
-  "\254\247\377\247\273\267\377\323\333\343\342\377\4\212\234\231\377Sl" \
-  "g\377Voj\377\307\322\320\377\206\333\343\342\377\1\270\305\303\377\203" \
-  "Slg\377\2Vni\377\303\316\314\377\203\333\343\342\377\5\331\342\341\377" \
-  "\210\233\227\377Slg\377Umh\377\315\327\325\377\321\333\343\342\377\3" \
-  "\261\303\277\377\223\254\247\377\321\333\331\377\207\377\377\377\377" \
-  "\3\347\354\353\377\223\254\247\377\243\270\264\377\250\333\343\342\377" \
-  "\3\314\327\325\377\223\254\247\377\252\275\271\377\207\377\377\377\377" \
-  "\4\376\376\376\377\242\267\263\377\223\254\247\377\320\333\331\377\322" \
-  "\333\343\342\377\3u\211\205\377Slg\377\221\242\237\377\207\333\343\342" \
-  "\377\1\204\227\223\377\203Slg\377\1\221\243\237\377\205\333\343\342\377" \
-  "\4\317\331\327\377Voj\377Slg\377\266\303\301\377\320\333\343\342\377" \
-  "\4\327\340\336\377\226\256\252\377\227\257\253\377\371\372\372\377\207" \
-  "\377\377\377\377\3\271\311\306\377\223\254\247\377\301\317\315\377\251" \
-  "\333\343\342\377\3\241\267\263\377\223\254\247\377\351\356\355\377\207" \
-  "\377\377\377\377\3\317\332\330\377\223\254\247\377\262\304\300\377\322" \
-  "\333\343\342\377\3dzv\377Slg\377\274\307\306\377\206\333\343\342\377" \
-  "\2\331\341\340\377\\to\377\202Slg\377\2Tmh\377\315\327\325\377\206\333" \
-  "\343\342\377\3z\216\212\377Slg\377\246\264\262\377\320\333\343\342\377" \
-  "\3\274\313\311\377\223\254\247\377\277\316\313\377\207\377\377\377\377" \
-  "\4\365\367\367\377\225\255\251\377\231\260\254\377\331\341\340\377\251" \
-  "\333\343\342\377\3\300\316\314\377\223\254\247\377\273\313\310\377\207" \
-  "\377\377\377\377\1\370\371\371\377\202\227\257\252\377\1\327\340\337" \
-  "\377\320\333\343\342\377\4\331\341\340\377Umh\377Slg\377\317\330\327" \
-  "\377\206\333\343\342\377\1\271\306\304\377\203Slg\377\1z\216\212\377" \
-  "\207\333\343\342\377\3\213\235\231\377Slg\377\225\246\243\377\320\333" \
-  "\343\342\377\3\236\265\260\377\223\254\247\377\355\361\360\377\207\377" \
-  "\377\377\377\3\313\327\324\377\223\254\247\377\266\306\303\377\252\333" \
-  "\343\342\377\4\331\341\340\377\230\260\253\377\226\256\251\377\366\370" \
-  "\370\377\207\377\377\377\377\3\275\314\311\377\223\254\247\377\276\315" \
-  "\312\377\320\333\343\342\377\1\324\334\333\377\202Slg\377\1\325\336\335" \
-  "\377\206\333\343\342\377\1\216\240\235\377\203Slg\377\1\255\272\270\377" \
-  "\207\333\343\342\377\3\227\247\244\377Slg\377\210\233\227\377\317\333" \
-  "\343\342\377\3\310\324\322\377\223\254\247\377\256\301\275\377\207\377" \
-  "\377\377\377\4\375\376\375\377\237\265\260\377\224\254\247\377\323\334" \
-  "\333\377\253\333\343\342\377\3\264\305\302\377\223\254\247\377\315\330" \
-  "\326\377\207\377\377\377\377\3\353\357\356\377\223\254\247\377\237\265" \
-  "\261\377\321\333\343\342\377\3\\to\377Slg\377\310\322\321\377\205\333" \
-  "\343\342\377\2\330\341\340\377_vr\377\202Slg\377\2Xpk\377\325\336\335" \
-  "\377\207\333\343\342\377\3\214\235\232\377Slg\377\216\237\234\377\317" \
-  "\333\343\342\377\3\252\275\271\377\223\254\247\377\333\343\342\377\207" \
-  "\377\377\377\377\3\334\344\343\377\223\254\247\377\252\275\272\377\254" \
-  "\333\343\342\377\4\322\334\332\377\223\254\247\377\240\266\262\377\376" \
-  "\376\376\377\207\377\377\377\377\3\254\277\273\377\223\254\247\377\311" \
-  "\325\323\377\320\333\343\342\377\3n\203\177\377Slg\377\257\274\272\377" \
-  "\205\333\343\342\377\1\261\277\274\377\203Slg\377\1\200\223\220\377\210" \
-  "\333\343\342\377\3{\217\213\377Slg\377\227\247\244\377\316\333\343\342" \
-  "\377\4\323\334\333\377\223\254\247\377\236\265\260\377\375\375\375\377" \
-  "\207\377\377\377\377\3\257\301\276\377\223\254\247\377\310\324\322\377" \
-  "\255\333\343\342\377\3\251\274\271\377\223\254\247\377\336\346\344\377" \
-  "\207\377\377\377\377\3\331\342\340\377\223\254\247\377\253\276\273\377" \
-  "\320\333\343\342\377\3\201\224\220\377Slg\377v\212\206\377\204\333\343" \
-  "\342\377\2\330\340\337\377i\200{\377\203Slg\377\1\260\276\273\377\207" \
-  "\333\343\342\377\4\325\335\334\377^uq\377Slg\377\253\271\267\377\316" \
-  "\333\343\342\377\3\265\306\303\377\223\254\247\377\312\326\324\377\207" \
-  "\377\377\377\377\3\356\361\361\377\223\254\247\377\236\265\260\377\256" \
-  "\333\343\342\377\3\307\323\321\377\223\254\247\377\261\303\277\377\207" \
-  "\377\377\377\377\4\374\375\375\377\235\263\257\377\224\255\250\377\323" \
-  "\335\334\377\317\333\343\342\377\1\263\300\275\377\202Slg\377\5\206\231" \
-  "\225\377\314\326\324\377\333\343\342\377\315\327\325\377\177\222\217" \
-  "\377\203Slg\377\2czu\377\331\341\340\377\207\333\343\342\377\1\234\253" \
-  "\251\377\202Slg\377\1\303\316\314\377\315\333\343\342\377\4\331\341\340" \
-  "\377\231\260\254\377\225\255\251\377\365\367\367\377\207\377\377\377" \
-  "\377\3\300\317\314\377\223\254\247\377\275\314\311\377\256\333\343\342" \
-  "\377\4\332\342\341\377\235\264\257\377\223\254\247\377\357\362\362\377" \
-  "\207\377\377\377\377\3\310\325\322\377\223\254\247\377\267\307\304\377" \
-  "\320\333\343\342\377\1m\202~\377\203Slg\377\1Xql\377\205Slg\377\1\235" \
-  "\254\252\377\207\333\343\342\377\4\241\261\256\377Voj\377Slg\377czu\377" \
-  "\316\333\343\342\377\3\301\317\314\377\223\254\247\377\271\311\306\377" \
-  "\207\377\377\377\377\4\371\373\372\377\230\260\253\377\226\256\252\377" \
-  "\327\340\336\377\257\333\343\342\377\3\273\313\310\377\223\254\247\377" \
-  "\302\320\315\377\207\377\377\377\377\4\363\366\366\377\224\255\250\377" \
-  "\232\261\254\377\331\341\340\377\317\333\343\342\377\2\265\302\300\377" \
-  "Voj\377\207Slg\377\2o\205\201\377\330\340\337\377\204\333\343\342\377" \
-  "\3\274\307\306\377\210\233\227\377k\201}\377\203Slg\377\1\221\243\237" \
-  "\377\316\333\343\342\377\3\243\270\264\377\223\254\247\377\346\354\352" \
-  "\377\207\377\377\377\377\3\322\334\332\377\223\254\247\377\261\303\277" \
-  "\377\260\333\343\342\377\4\326\337\336\377\226\256\251\377\231\261\254" \
-  "\377\372\373\373\377\207\377\377\377\377\3\267\307\304\377\223\254\247" \
-  "\377\302\320\316\377\320\333\343\342\377\2\274\310\306\377_wr\377\205" \
-  "Slg\377\2j\200|\377\311\324\322\377\205\333\343\342\377\1\226\247\244" \
-  "\377\205Slg\377\1\300\313\311\377\315\333\343\342\377\3\314\330\326\377" \
-  "\223\254\247\377\247\273\267\377\210\377\377\377\377\3\244\271\265\377" \
-  "\223\254\247\377\317\332\330\377\261\333\343\342\377\3\260\302\276\377" \
-  "\223\254\247\377\324\336\334\377\207\377\377\377\377\3\344\352\351\377" \
-  "\223\254\247\377\244\271\265\377\321\333\343\342\377\7\316\330\326\377" \
-  "\250\266\264\377\214\236\233\377v\213\207\377\206\230\225\377\244\263" \
-  "\260\377\330\341\340\377\206\333\343\342\377\1\243\262\257\377\204l\201" \
-  "}\377\1x\215\211\377\316\333\343\342\377\3\256\301\275\377\223\254\247" \
-  "\377\325\336\334\377\207\377\377\377\377\3\343\351\350\377\223\254\247" \
-  "\377\245\272\266\377\262\333\343\342\377\3\316\331\327\377\223\254\247" \
-  "\377\246\273\267\377\210\377\377\377\377\3\245\272\266\377\223\254\247" \
-  "\377\316\331\327\377\377\333\343\342\377\261\333\343\342\377\4\325\337" \
-  "\335\377\225\255\251\377\232\261\254\377\373\374\373\377\207\377\377" \
-  "\377\377\3\266\307\303\377\223\254\247\377\303\321\317\377\263\333\343" \
-  "\342\377\3\244\271\265\377\223\254\247\377\345\353\352\377\207\377\377" \
-  "\377\377\3\322\335\333\377\223\254\247\377\260\302\276\377\377\333\343" \
-  "\342\377\261\333\343\342\377\3\272\311\307\377\223\254\247\377\303\321" \
-  "\316\377\207\377\377\377\377\4\363\366\365\377\224\255\250\377\232\262" \
-  "\255\377\332\342\341\377\263\333\343\342\377\3\302\320\316\377\223\254" \
-  "\247\377\270\310\305\377\207\377\377\377\377\4\372\373\373\377\231\260" \
-  "\254\377\226\256\251\377\326\337\336\377\377\333\343\342\377\257\333" \
-  "\343\342\377\4\332\342\341\377\234\263\256\377\223\254\247\377\360\363" \
-  "\362\377\207\377\377\377\377\3\307\324\321\377\223\254\247\377\270\310" \
-  "\305\377\264\333\343\342\377\4\331\341\340\377\232\261\254\377\225\255" \
-  "\250\377\364\367\366\377\207\377\377\377\377\3\301\317\314\377\223\254" \
-  "\247\377\273\313\310\377\314\333\343\342\377\3\277\312\310\377\237\256" \
-  "\253\377\254\272\270\377\337\333\343\342\377\3\305\322\320\377\223\254" \
-  "\247\377\262\304\300\377\207\377\377\377\377\4\374\375\374\377\234\263" \
-  "\256\377\224\255\250\377\324\336\334\377\265\333\343\342\377\3\266\307" \
-  "\304\377\223\254\247\377\311\325\323\377\207\377\377\377\377\4\356\362" \
-  "\361\377\223\254\247\377\235\264\257\377\332\342\341\377\313\333\343" \
-  "\342\377\3\233\253\250\377Slg\377p\205\201\377\337\333\343\342\377\3" \
-  "\247\273\267\377\223\254\247\377\337\346\345\377\207\377\377\377\377" \
-  "\3\330\341\337\377\223\254\247\377\254\277\274\377\266\333\343\342\377" \
-  "\4\323\335\334\377\224\255\250\377\235\264\257\377\375\375\375\377\207" \
-  "\377\377\377\377\3\260\302\276\377\223\254\247\377\307\323\321\377\313" \
-  "\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\336\333\343\342" \
-  "\377\4\321\333\331\377\223\254\247\377\241\266\262\377\376\376\376\377" \
-  "\207\377\377\377\377\3\253\276\273\377\223\254\247\377\312\326\324\377" \
-  "\267\333\343\342\377\3\253\276\272\377\223\254\247\377\333\343\341\377" \
-  "\207\377\377\377\377\3\335\345\343\377\223\254\247\377\251\274\271\377" \
-  "\313\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\336\333\343" \
-  "\342\377\3\263\304\301\377\223\254\247\377\315\331\326\377\207\377\377" \
-  "\377\377\3\351\356\355\377\223\254\247\377\241\266\262\377\270\333\343" \
-  "\342\377\3\311\325\323\377\223\254\247\377\254\277\273\377\207\377\377" \
-  "\377\377\4\375\376\375\377\240\265\261\377\223\254\247\377\321\334\332" \
-  "\377\312\333\343\342\377\3\233\253\250\377Slg\377[sn\377\223x\215\211" \
-  "\377\5z\216\212\377\202\225\221\377\214\236\233\377\246\265\262\377\310" \
-  "\323\321\377\305\333\343\342\377\4\330\340\337\377\227\257\252\377\226" \
-  "\256\252\377\367\371\370\377\207\377\377\377\377\3\274\313\310\377\223" \
-  "\254\247\377\277\315\313\377\271\333\343\342\377\3\237\265\261\377\223" \
-  "\254\247\377\353\360\357\377\207\377\377\377\377\3\314\327\325\377\223" \
-  "\254\247\377\264\305\302\377\312\333\343\342\377\1\233\253\250\377\232" \
-  "Slg\377\2x\214\210\377\275\311\307\377\303\333\343\342\377\3\276\315" \
-  "\312\377\223\254\247\377\274\313\310\377\207\377\377\377\377\4\367\371" \
-  "\370\377\226\256\251\377\230\257\253\377\330\341\337\377\271\333\343" \
-  "\342\377\3\275\314\312\377\223\254\247\377\276\315\312\377\207\377\377" \
-  "\377\377\4\366\370\370\377\225\256\251\377\230\260\253\377\330\341\340" \
-  "\377\311\333\343\342\377\1\233\253\250\377\233Slg\377\2Tmh\377\237\256" \
-  "\253\377\302\333\343\342\377\3\240\266\262\377\223\254\247\377\351\356" \
-  "\355\377\207\377\377\377\377\3\315\330\326\377\223\254\247\377\263\305" \
-  "\301\377\272\333\343\342\377\1\327\340\337\377\202\227\257\252\377\1" \
-  "\370\371\371\377\207\377\377\377\377\3\272\312\307\377\223\254\247\377" \
-  "\300\316\314\377\311\333\343\342\377\1\233\253\250\377\235Slg\377\1\243" \
-  "\262\257\377\300\333\343\342\377\3\312\326\324\377\223\254\247\377\252" \
-  "\276\272\377\207\377\377\377\377\4\376\376\376\377\240\266\262\377\223" \
-  "\254\247\377\321\333\332\377\273\333\343\342\377\3\262\303\300\377\223" \
-  "\254\247\377\317\332\330\377\207\377\377\377\377\3\350\355\354\377\223" \
-  "\254\247\377\241\267\263\377\311\333\343\342\377\4\321\332\331\377\305" \
-  "\320\316\377\305\317\316\377\207\231\226\377\202Slg\377\5j\200|\377\224" \
-  "\245\242\377\244\263\260\377\264\300\276\377\302\315\313\377\202\305" \
-  "\320\316\377\16\274\307\306\377\254\272\270\377\235\255\252\377\207\232" \
-  "\226\377Xql\377Slg\377^vq\377\257\274\272\377\305\320\316\377\304\316" \
-  "\315\377\266\303\301\377\247\265\263\377\227\250\245\377s\210\203\377" \
-  "\203Slg\377\2Vni\377\304\317\315\377\277\333\343\342\377\3\254\277\273" \
-  "\377\223\254\247\377\330\341\337\377\207\377\377\377\377\3\336\346\344" \
-  "\377\223\254\247\377\247\273\270\377\274\333\343\342\377\4\320\332\331" \
-  "\377\223\254\247\377\242\270\263\377\376\376\376\377\207\377\377\377" \
-  "\377\3\251\275\271\377\223\254\247\377\313\327\325\377\311\333\343\342" \
-  "\377\5\327\340\337\377y\215\211\377Slg\377q\207\202\377\266\302\300\377" \
-  "\213\333\343\342\377\5\321\333\331\377\233\253\250\377Yrm\377Wpk\377" \
-  "\255\273\271\377\205\333\343\342\377\2\271\305\303\377r\207\203\377\202" \
-  "Slg\377\1\203\226\222\377\276\333\343\342\377\4\324\336\334\377\224\255" \
-  "\250\377\234\263\256\377\374\375\374\377\207\377\377\377\377\3\261\303" \
-  "\277\377\223\254\247\377\306\323\321\377\275\333\343\342\377\3\246\273" \
-  "\267\377\223\254\247\377\340\347\346\377\207\377\377\377\377\3\326\340" \
-  "\336\377\223\254\247\377\255\300\274\377\311\333\343\342\377\4\211\234" \
-  "\230\377Slg\377n\204\200\377\325\336\335\377\216\333\343\342\377\4\263" \
-  "\300\275\377Tlg\377Wpk\377\300\314\312\377\205\333\343\342\377\5\325" \
-  "\335\334\377f}x\377Slg\377Umh\377\324\334\333\377\275\333\343\342\377" \
-  "\3\267\310\305\377\223\254\247\377\307\324\321\377\207\377\377\377\377" \
-  "\4\357\363\362\377\223\254\247\377\234\263\257\377\332\342\341\377\275" \
-  "\333\343\342\377\3\304\322\317\377\223\254\247\377\263\304\301\377\207" \
-  "\377\377\377\377\4\373\374\374\377\233\262\255\377\225\255\250\377\325" \
-  "\336\335\377\307\333\343\342\377\4\275\311\307\377Slg\377\\so\377\316" \
-  "\327\326\377\220\333\343\342\377\3\227\250\245\377Slg\377p\206\202\377" \
-  "\206\333\343\342\377\4\276\312\310\377Tlg\377Slg\377\266\302\300\377" \
-  "\274\333\343\342\377\4\331\342\341\377\232\261\255\377\224\254\247\377" \
-  "\362\365\364\377\207\377\377\377\377\3\302\320\315\377\223\254\247\377" \
-  "\272\312\307\377\276\333\343\342\377\4\332\342\341\377\233\262\256\377" \
-  "\223\254\247\377\361\364\363\377\207\377\377\377\377\3\305\322\320\377" \
-  "\223\254\247\377\271\311\306\377\307\333\343\342\377\3\211\233\230\377" \
-  "Slg\377|\217\214\377\221\333\343\342\377\1\304\317\315\377\202Slg\377" \
-  "\1\305\317\316\377\206\333\343\342\377\3f}x\377Slg\377\235\254\252\377" \
-  "\274\333\343\342\377\3\303\320\316\377\223\254\247\377\265\306\302\377" \
-  "\207\377\377\377\377\4\372\373\373\377\231\261\254\377\225\255\251\377" \
-  "\326\337\336\377\277\333\343\342\377\3\271\311\306\377\223\254\247\377" \
-  "\304\322\317\377\207\377\377\377\377\4\361\364\363\377\223\254\247\377" \
-  "\233\262\256\377\332\342\341\377\306\333\343\342\377\3e{w\377Slg\377" \
-  "\227\250\245\377\221\333\343\342\377\4\331\342\341\377Xql\377Slg\377" \
-  "\241\261\256\377\206\333\343\342\377\3}\221\215\377Slg\377\221\242\237" \
-  "\377\274\333\343\342\377\3\245\271\265\377\223\254\247\377\343\351\350" \
-  "\377\207\377\377\377\377\3\324\336\334\377\223\254\247\377\256\301\275" \
-  "\377\300\333\343\342\377\4\325\336\335\377\225\255\250\377\232\262\255" \
-  "\377\373\374\374\377\207\377\377\377\377\3\264\305\301\377\223\254\247" \
-  "\377\304\321\317\377\305\333\343\342\377\4\332\342\341\377Vni\377Slg" \
-  "\377\243\262\257\377\222\333\343\342\377\3czu\377Slg\377\223\244\241" \
-  "\377\206\333\343\342\377\3\224\244\241\377Slg\377\210\233\227\377\273" \
-  "\333\343\342\377\3\316\331\330\377\223\254\247\377\244\271\264\377\210" \
-  "\377\377\377\377\3\246\273\267\377\223\254\247\377\315\330\326\377\301" \
-  "\333\343\342\377\4\255\300\274\377\222\253\246\377\315\330\326\377\376" \
-  "\376\376\377\206\377\377\377\377\3\341\350\346\377\223\254\247\377\246" \
-  "\272\266\377\305\333\343\342\377\1\322\333\332\377\202Slg\377\1\205\230" \
-  "\224\377\221\333\343\342\377\1\316\327\326\377\202Slg\377\1\211\234\230" \
-  "\377\206\333\343\342\377\3\220\242\236\377Slg\377\222\243\240\377\273" \
-  "\333\343\342\377\3\260\302\277\377\223\254\247\377\321\334\332\377\207" \
-  "\377\377\377\377\3\345\353\352\377\223\254\247\377\243\270\264\377\302" \
-  "\333\343\342\377\16\314\327\325\377\223\254\246\377\223\254\247\377\226" \
-  "\256\251\377\244\271\265\377\264\305\302\377\303\321\316\377\323\335" \
-  "\333\377\342\351\350\377\361\365\364\377\375\375\375\377\242\270\263" \
-  "\377\223\254\247\377\317\332\330\377\304\333\343\342\377\4\332\342\341" \
-  "\377Vni\377Slg\377f|x\377\221\333\343\342\377\1\256\274\271\377\202S" \
-  "lg\377\1\226\246\243\377\206\333\343\342\377\3\202\225\221\377Slg\377" \
-  "\237\257\254\377\272\333\343\342\377\4\327\337\336\377\226\256\251\377" \
-  "\230\260\253\377\371\372\372\377\207\377\377\377\377\3\270\310\305\377" \
-  "\223\254\247\377\301\317\315\377\303\333\343\342\377\15\232\262\255\377" \
-  "\223\254\246\377\325\336\335\377\331\342\340\377\312\326\324\377\273" \
-  "\313\310\377\254\277\273\377\235\263\257\377\223\254\247\377\226\256" \
-  "\251\377\234\263\256\377\222\254\246\377\256\300\274\377\305\333\343" \
-  "\342\377\1i\200{\377\202Slg\377\1\224\244\241\377\217\333\343\342\377" \
-  "\2\313\325\323\377czu\377\202Slg\377\1\253\271\266\377\205\333\343\342" \
-  "\377\4\331\341\340\377czu\377Slg\377\254\272\270\377\272\333\343\342" \
-  "\377\3\274\313\310\377\223\254\247\377\277\316\313\377\207\377\377\377" \
-  "\377\4\364\367\366\377\225\255\250\377\231\260\254\377\331\341\340\377" \
-  "\303\333\343\342\377\3\275\313\311\377\222\254\246\377\257\301\276\377" \
-  "\205\377\377\377\377\3\372\373\373\377\353\360\357\377\327\340\335\377" \
-  "\202\224\255\250\377\3\327\340\337\377\331\342\341\377\322\334\333\377" \
-  "\302\333\343\342\377\1\226\247\244\377\203Slg\377\2\231\252\247\377\330" \
-  "\341\340\377\214\333\343\342\377\2\310\323\321\377f|x\377\202Slg\377" \
-  "\2Voj\377\323\334\332\377\205\333\343\342\377\1\253\271\266\377\202S" \
-  "lg\377\1\272\306\304\377\272\333\343\342\377\3\236\264\260\377\223\254" \
-  "\247\377\355\361\360\377\207\377\377\377\377\3\311\325\323\377\223\254" \
-  "\247\377\266\306\303\377\304\333\343\342\377\4\331\341\340\377\224\255" \
-  "\250\377\224\254\247\377\366\370\367\377\207\377\377\377\377\5\263\305" \
-  "\301\377\222\254\246\377\266\306\302\377\232\262\254\377\240\266\262" \
-  "\377\302\333\343\342\377\2\314\325\324\377Xql\377\203Slg\377\4_wr\377" \
-  "\221\243\237\377\304\316\315\377\330\341\340\377\206\333\343\342\377" \
-  "\4\322\333\332\377\254\271\267\377w\214\210\377Tlg\377\203Slg\377\1\211" \
-  "\233\230\377\205\333\343\342\377\5\263\300\276\377Xql\377Slg\377Xql\377" \
-  "\326\336\335\377\271\333\343\342\377\3\310\324\322\377\223\254\247\377" \
-  "\256\301\275\377\207\377\377\377\377\4\375\375\375\377\235\264\257\377" \
-  "\223\254\247\377\323\334\333\377\305\333\343\342\377\3\256\300\276\377" \
-  "\223\253\246\377\305\322\320\377\207\377\377\377\377\6\353\360\357\377" \
-  "\222\254\247\377\231\261\255\377\241\267\262\377\223\254\247\377\312" \
-  "\326\324\377\302\333\343\342\377\1\237\256\253\377\206Slg\377\7Tlg\377" \
-  "^vq\377l\202~\377y\215\211\377s\210\203\377e|w\377Xpk\377\206Slg\377" \
-  "\2_wr\377\321\333\331\377\203\333\343\342\377\2\255\272\270\377q\207" \
-  "\202\377\203Slg\377\1~\222\216\377\272\333\343\342\377\3\251\275\271" \
-  "\377\223\254\247\377\334\344\342\377\207\377\377\377\377\3\333\343\341" \
-  "\377\223\254\247\377\252\275\271\377\306\333\343\342\377\4\322\334\332" \
-  "\377\223\253\246\377\231\260\253\377\375\376\375\377\207\377\377\377" \
-  "\377\5\242\267\263\377\222\253\246\377\265\305\302\377\223\254\247\377" \
-  "\254\277\273\377\303\333\343\342\377\1\220\242\236\377\221Slg\377\2_" \
-  "vr\377\304\316\315\377\204\333\343\342\377\1}\220\215\377\204Slg\377" \
-  "\1\251\267\265\377\271\333\343\342\377\4\322\334\333\377\223\254\247" \
-  "\377\236\265\260\377\375\376\375\377\207\377\377\377\377\3\255\300\274" \
-  "\377\223\254\247\377\310\324\322\377\307\333\343\342\377\3\241\266\263" \
-  "\377\223\253\247\377\332\342\341\377\203\377\377\377\377\2\371\372\372" \
-  "\377\364\367\366\377\202\377\377\377\377\6\326\340\336\377\222\254\246" \
-  "\377\243\270\263\377\230\260\253\377\225\255\250\377\324\336\334\377" \
-  "\303\333\343\342\377\2\242\261\256\377Yql\377\216Slg\377\2s\210\204\377" \
-  "\310\322\321\377\205\333\343\342\377\1\235\255\252\377\204\201\224\220" \
-  "\377\1\321\333\331\377\271\333\343\342\377\3\265\306\302\377\223\254" \
-  "\247\377\312\326\324\377\207\377\377\377\377\3\354\360\357\377\223\254" \
-  "\247\377\236\265\260\377\310\333\343\342\377\3\306\322\320\377\222\253" \
-  "\246\377\244\271\266\377\203\377\377\377\377\2\244\271\264\377\272\312" \
-  "\307\377\202\377\377\377\377\6\374\375\375\377\227\257\252\377\223\254" \
-  "\246\377\260\303\277\377\223\254\247\377\267\310\305\377\304\333\343" \
-  "\342\377\3\313\325\323\377\212\234\231\377Yrm\377\212Slg\377\3n\203\177" \
-  "\377\247\266\263\377\332\342\341\377\304\333\343\342\377\4\331\341\340" \
-  "\377\230\260\253\377\225\255\251\377\365\367\367\377\207\377\377\377" \
-  "\377\3\277\315\312\377\223\254\247\377\275\314\311\377\310\333\343\342" \
-  "\377\4\332\342\341\377\227\257\253\377\223\253\246\377\356\361\361\377" \
-  "\202\377\377\377\377\3\312\326\324\377\226\256\251\377\367\370\370\377" \
-  "\202\377\377\377\377\6\300\316\314\377\223\253\246\377\226\256\250\377" \
-  "\223\254\247\377\233\261\255\377\332\342\341\377\305\333\343\342\377" \
-  "\13\324\335\334\377\261\277\274\377\224\244\241\377|\217\214\377r\207" \
-  "\203\377j\200|\377n\203\177\377v\213\207\377\205\227\224\377\242\261" \
-  "\256\377\303\316\314\377\307\333\343\342\377\3\301\317\314\377\223\254" \
-  "\247\377\271\311\306\377\207\377\377\377\377\4\370\372\371\377\227\257" \
-  "\252\377\226\256\252\377\327\340\336\377\311\333\343\342\377\3\267\310" \
-  "\305\377\223\253\246\377\266\307\304\377\202\377\377\377\377\3\365\367" \
-  "\367\377\225\256\251\377\315\330\326\377\202\377\377\377\377\6\364\366" \
-  "\366\377\223\254\246\377\223\253\247\377\235\263\260\377\223\254\247" \
-  "\377\303\321\317\377\377\333\343\342\377\230\333\343\342\377\3\242\267" \
-  "\263\377\223\254\247\377\346\354\353\377\207\377\377\377\377\3\320\333" \
-  "\331\377\223\254\247\377\261\303\277\377\312\333\343\342\377\4\326\337" \
-  "\336\377\223\254\247\377\224\255\250\377\371\373\372\377\202\377\377" \
-  "\377\377\3\271\311\306\377\241\266\262\377\376\376\376\377\202\377\377" \
-  "\377\377\5\253\277\273\377\223\253\247\377\263\305\302\377\223\254\247" \
-  "\377\245\271\265\377\377\333\343\342\377\227\333\343\342\377\3\314\330" \
-  "\326\377\223\254\247\377\247\273\267\377\207\377\377\377\377\4\376\376" \
-  "\376\377\243\270\264\377\223\254\247\377\317\332\330\377\313\333\343" \
-  "\342\377\3\251\274\270\377\222\254\247\377\315\330\325\377\202\377\377" \
-  "\377\377\3\346\354\353\377\223\254\247\377\337\346\345\377\202\377\377" \
-  "\377\377\2\344\352\350\377\223\254\246\377\202\235\263\257\377\2\223" \
-  "\254\247\377\316\331\330\377\377\333\343\342\377\226\333\343\342\377" \
-  "\3\256\300\275\377\223\254\247\377\325\337\335\377\207\377\377\377\377" \
-  "\3\341\350\347\377\223\254\247\377\245\272\266\377\314\333\343\342\377" \
-  "\3\316\331\327\377\222\253\246\377\234\263\256\377\203\377\377\377\377" \
-  "\2\247\274\270\377\261\303\300\377\203\377\377\377\377\5\234\263\256" \
-  "\377\223\253\246\377\263\305\301\377\223\254\247\377\260\303\277\377" \
-  "\322\333\343\342\377\1\304\317\315\377\202\201\224\220\377\277\333\343" \
-  "\342\377\4\325\336\335\377\225\255\250\377\232\261\255\377\373\374\373" \
-  "\377\207\377\377\377\377\3\264\305\302\377\223\254\247\377\303\321\317" \
-  "\377\315\333\343\342\377\3\235\263\260\377\223\253\246\377\342\351\347" \
-  "\377\202\377\377\377\377\3\325\336\334\377\223\254\247\377\360\363\363" \
-  "\377\202\377\377\377\377\5\315\330\326\377\223\253\246\377\247\274\267" \
-  "\377\227\256\251\377\253\276\273\377\322\333\343\342\377\1\270\305\303" \
-  "\377\202Slg\377\277\333\343\342\377\3\271\311\306\377\223\254\247\377" \
-  "\303\321\316\377\207\377\377\377\377\4\361\364\364\377\224\254\247\377" \
-  "\232\262\255\377\332\342\341\377\315\333\343\342\377\3\300\317\315\377" \
-  "\223\254\246\377\253\277\272\377\202\377\377\377\377\3\373\374\374\377" \
-  "\232\262\255\377\303\321\316\377\202\377\377\377\377\4\372\373\373\377" \
-  "\225\255\251\377\224\254\247\377\321\333\332\377\323\333\343\342\377" \
-  "\1\270\305\303\377\202Slg\377\276\333\343\342\377\4\332\342\341\377\234" \
-  "\263\256\377\223\254\247\377\360\363\363\377\207\377\377\377\377\3\305" \
-  "\323\320\377\223\254\247\377\270\310\305\377\316\333\343\342\377\4\331" \
-  "\341\340\377\226\255\251\377\223\253\247\377\363\366\365\377\202\377" \
-  "\377\377\377\3\304\321\317\377\232\262\255\377\373\374\374\377\202\377" \
-  "\377\377\377\3\267\310\304\377\222\253\246\377\270\310\304\377\306\333" \
-  "\343\342\377\2\317\331\327\377\301\314\312\377\213\275\310\306\377\1" \
-  "\242\261\256\377\202Slg\377\276\333\343\342\377\3\305\322\320\377\223" \
-  "\254\247\377\262\304\300\377\207\377\377\377\377\4\374\374\374\377\233" \
-  "\262\255\377\224\255\250\377\324\336\334\377\317\333\343\342\377\3\261" \
-  "\303\300\377\223\253\246\377\276\315\313\377\202\377\377\377\377\3\360" \
-  "\364\363\377\223\254\247\377\325\337\335\377\202\377\377\377\377\4\357" \
-  "\362\362\377\222\253\246\377\231\260\253\377\332\342\341\377\301\333" \
-  "\343\342\377\4\305\320\316\377\204\227\223\377e|w\377Voj\377\220Slg\377" \
-  "\276\333\343\342\377\3\247\273\267\377\223\254\247\377\340\347\345\377" \
-  "\207\377\377\377\377\3\327\340\336\377\223\254\247\377\254\277\274\377" \
-  "\320\333\343\342\377\4\323\335\334\377\223\253\247\377\226\256\252\377" \
-  "\374\375\374\377\202\377\377\377\377\2\262\304\301\377\250\274\270\377" \
-  "\202\377\377\377\377\4\354\360\357\377\232\262\255\377\223\253\247\377" \
-  "\306\323\321\377\277\333\343\342\377\3\325\335\334\377\202\225\221\377" \
-  "Tlg\377\223Slg\377\275\333\343\342\377\4\320\333\331\377\223\254\247" \
-  "\377\241\267\262\377\376\376\376\377\207\377\377\377\377\3\251\275\271" \
-  "\377\223\254\247\377\312\326\324\377\321\333\343\342\377\3\244\271\264" \
-  "\377\223\254\247\377\325\337\335\377\202\377\377\377\377\10\340\347\346" \
-  "\377\223\254\247\377\312\327\324\377\255\300\274\377\226\256\251\377" \
-  "\255\277\274\377\222\254\247\377\250\274\270\377\277\333\343\342\377" \
-  "\1\207\232\226\377\225Slg\377\275\333\343\342\377\3\262\304\300\377\223" \
-  "\254\247\377\316\331\327\377\207\377\377\377\377\3\350\355\354\377\223" \
-  "\254\247\377\240\266\262\377\322\333\343\342\377\16\311\325\323\377\223" \
-  "\254\246\377\241\266\263\377\377\377\377\377\364\367\366\377\310\325" \
-  "\322\377\227\257\252\377\234\263\256\377\312\327\324\377\365\370\367" \
-  "\377\376\376\376\377\240\266\261\377\223\254\247\377\321\333\332\377" \
-  "\275\333\343\342\377\1\257\275\272\377\205Slg\377\4Voj\377axt\377k\201" \
-  "|\377t\211\205\377\212x\215\211\377\1o\204\200\377\202Slg\377\274\333" \
-  "\343\342\377\4\330\340\337\377\227\257\252\377\226\256\252\377\367\371" \
-  "\371\377\207\377\377\377\377\3\273\312\307\377\223\254\247\377\277\315" \
-  "\313\377\323\333\343\342\377\7\231\260\254\377\223\253\247\377\260\302" \
-  "\276\377\225\256\251\377\257\301\276\377\334\344\343\377\376\376\376" \
-  "\377\203\377\377\377\377\3\315\330\326\377\223\254\247\377\264\305\302" \
-  "\377\275\333\343\342\377\1\201\225\221\377\203Slg\377\3~\222\216\377" \
-  "\261\277\274\377\327\340\337\377\215\333\343\342\377\1\270\305\303\377" \
-  "\202Slg\377\274\333\343\342\377\3\276\315\312\377\223\254\247\377\274" \
-  "\314\311\377\207\377\377\377\377\4\366\370\370\377\225\256\251\377\230" \
-  "\257\253\377\330\341\337\377\323\333\343\342\377\4\273\312\310\377\222" \
-  "\254\246\377\244\271\265\377\356\362\361\377\206\377\377\377\377\4\366" \
-  "\370\370\377\226\256\251\377\230\257\253\377\330\341\340\377\274\333" \
-  "\343\342\377\1i\200{\377\202Slg\377\1\204\226\223\377\220\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\274\333\343\342\377\3\237\265\261\377" \
-  "\223\254\247\377\352\357\356\377\207\377\377\377\377\3\314\330\325\377" \
-  "\223\254\247\377\263\304\301\377\324\333\343\342\377\4\327\340\337\377" \
-  "\227\257\252\377\226\256\252\377\367\371\371\377\207\377\377\377\377" \
-  "\3\273\313\310\377\223\254\247\377\277\316\313\377\273\333\343\342\377" \
-  "\2\330\340\337\377Uni\377\202Slg\377\1\321\333\331\377\220\333\343\342" \
-  "\377\1\270\305\303\377\202Slg\377\273\333\343\342\377\3\312\326\324\377" \
-  "\223\254\247\377\253\276\273\377\207\377\377\377\377\4\376\376\376\377" \
-  "\240\265\261\377\223\254\247\377\321\333\332\377\325\333\343\342\377" \
-  "\3\262\303\300\377\223\254\247\377\316\331\327\377\207\377\377\377\377" \
-  "\3\350\356\355\377\223\254\247\377\241\267\262\377\273\333\343\342\377" \
-  "\4\326\337\336\377Tlg\377Slg\377byt\377\221\333\343\342\377\1\330\341" \
-  "\340\377\202\322\333\332\377\273\333\343\342\377\3\253\276\273\377\223" \
-  "\254\247\377\330\341\337\377\207\377\377\377\377\3\335\345\344\377\223" \
-  "\254\247\377\247\273\270\377\326\333\343\342\377\4\320\332\331\377\223" \
-  "\254\247\377\241\267\262\377\376\376\376\377\207\377\377\377\377\3\252" \
-  "\275\271\377\223\254\247\377\313\326\325\377\273\333\343\342\377\3cz" \
-  "u\377Slg\377l\202~\377\316\333\343\342\377\4\323\335\334\377\224\255" \
-  "\250\377\234\263\256\377\374\375\374\377\207\377\377\377\377\3\260\302" \
-  "\276\377\223\254\247\377\306\323\321\377\327\333\343\342\377\3\246\273" \
-  "\267\377\223\254\247\377\340\347\345\377\207\377\377\377\377\3\327\340" \
-  "\336\377\223\254\247\377\254\277\274\377\273\333\343\342\377\4\207\231" \
-  "\226\377Slg\377Vni\377\327\337\336\377\315\333\343\342\377\3\267\307" \
-  "\304\377\223\254\247\377\307\324\321\377\207\377\377\377\377\4\356\362" \
-  "\361\377\223\254\247\377\234\263\257\377\332\342\341\377\327\333\343" \
-  "\342\377\3\304\322\317\377\223\254\247\377\262\304\300\377\207\377\377" \
-  "\377\377\4\374\374\374\377\233\262\256\377\224\255\250\377\325\336\335" \
-  "\377\272\333\343\342\377\1\305\317\316\377\202Slg\377\1\271\306\304\377" \
-  "\220\333\343\342\377\1\307\322\320\377\202\216\237\234\377\271\333\343" \
-  "\342\377\4\331\342\341\377\232\261\255\377\224\255\250\377\363\366\365" \
-  "\377\207\377\377\377\377\3\302\320\315\377\223\254\247\377\272\312\307" \
-  "\377\330\333\343\342\377\4\332\342\341\377\233\262\256\377\223\254\247" \
-  "\377\360\363\363\377\207\377\377\377\377\3\306\323\320\377\223\254\247" \
-  "\377\270\310\305\377\273\333\343\342\377\4\232\252\247\377Slg\377d{v" \
-  "\377\317\330\327\377\217\333\343\342\377\1\270\305\303\377\202Slg\377" \
-  "\271\333\343\342\377\3\303\320\316\377\223\254\247\377\266\307\303\377" \
-  "\207\377\377\377\377\4\372\373\373\377\231\260\254\377\225\255\251\377" \
-  "\326\337\336\377\331\333\343\342\377\3\271\311\306\377\223\254\247\377" \
-  "\303\321\316\377\207\377\377\377\377\4\362\365\364\377\224\254\247\377" \
-  "\233\262\255\377\332\342\341\377\273\333\343\342\377\4\226\246\243\377" \
-  "Tmh\377l\201}\377\267\303\301\377\216\333\343\342\377\1\270\305\303\377" \
-  "\202Slg\377\271\333\343\342\377\3\244\271\265\377\223\254\247\377\343" \
-  "\352\350\377\207\377\377\377\377\3\323\335\333\377\223\254\247\377\256" \
-  "\301\275\377\332\333\343\342\377\4\325\336\335\377\225\255\250\377\232" \
-  "\261\254\377\373\374\373\377\207\377\377\377\377\3\264\306\302\377\223" \
-  "\254\247\377\304\321\317\377\271\333\343\342\377\1\317\330\327\377\202" \
-  "\301\314\312\377\10\246\265\262\377^vq\377Slg\377k\201}\377\226\247\244" \
-  "\377\245\264\261\377\263\300\276\377\277\313\311\377\211\301\314\312" \
-  "\377\1\245\264\261\377\202Slg\377\270\333\343\342\377\3\316\331\327\377" \
-  "\223\254\247\377\245\271\265\377\210\377\377\377\377\3\246\272\266\377" \
-  "\223\254\247\377\315\330\326\377\333\333\343\342\377\3\255\300\274\377" \
-  "\223\254\247\377\325\336\334\377\207\377\377\377\377\3\342\350\347\377" \
-  "\223\254\247\377\245\272\266\377\271\333\343\342\377\1\233\253\250\377" \
-  "\226Slg\377\270\333\343\342\377\3\260\302\276\377\223\254\247\377\322" \
-  "\334\332\377\207\377\377\377\377\3\344\352\351\377\223\254\247\377\243" \
-  "\270\264\377\334\333\343\342\377\3\314\327\325\377\223\254\247\377\247" \
-  "\273\267\377\207\377\377\377\377\4\376\376\376\377\243\270\264\377\223" \
-  "\254\247\377\317\332\330\377\270\333\343\342\377\1\233\253\250\377\226" \
-  "Slg\377\267\333\343\342\377\4\326\337\336\377\226\256\251\377\230\260" \
-  "\253\377\371\373\372\377\207\377\377\377\377\3\267\307\304\377\223\254" \
-  "\247\377\301\317\315\377\335\333\343\342\377\3\241\267\263\377\223\254" \
-  "\247\377\346\354\353\377\207\377\377\377\377\3\320\333\331\377\223\254" \
-  "\247\377\261\303\277\377\270\333\343\342\377\1\233\253\250\377\226Sl" \
-  "g\377\267\333\343\342\377\3\273\313\310\377\223\254\247\377\300\317\314" \
-  "\377\207\377\377\377\377\4\363\366\366\377\224\255\250\377\231\260\254" \
-  "\377\331\341\340\377\335\333\343\342\377\3\300\316\314\377\223\254\247" \
-  "\377\271\311\306\377\207\377\377\377\377\4\371\372\372\377\227\257\253" \
-  "\377\226\256\252\377\327\340\337\377\267\333\343\342\377\3\233\253\250" \
-  "\377Slg\377[sn\377\221x\215\211\377\1o\204\200\377\202Slg\377\266\333" \
-  "\343\342\377\4\332\342\341\377\235\264\257\377\223\254\247\377\356\361" \
-  "\361\377\207\377\377\377\377\3\310\325\322\377\223\254\247\377\266\306" \
-  "\303\377\336\333\343\342\377\4\330\341\340\377\230\260\253\377\225\255" \
-  "\251\377\365\367\367\377\207\377\377\377\377\3\277\316\313\377\223\254" \
-  "\247\377\275\314\311\377\267\333\343\342\377\3\233\253\250\377Slg\377" \
-  "p\205\201\377\221\333\343\342\377\1\270\305\303\377\202Slg\377\266\333" \
-  "\343\342\377\3\307\324\322\377\223\254\247\377\257\301\276\377\207\377" \
-  "\377\377\377\4\374\375\375\377\235\264\257\377\223\254\247\377\323\334" \
-  "\333\377\337\333\343\342\377\3\264\305\302\377\223\254\247\377\312\326" \
-  "\324\377\207\377\377\377\377\3\354\361\360\377\223\254\247\377\236\265" \
-  "\260\377\267\333\343\342\377\3\233\253\250\377Slg\377p\205\201\377\221" \
-  "\333\343\342\377\1\270\305\303\377\202Slg\377\266\333\343\342\377\3\251" \
-  "\274\271\377\223\254\247\377\334\344\343\377\207\377\377\377\377\3\332" \
-  "\342\340\377\223\254\247\377\252\275\271\377\340\333\343\342\377\4\322" \
-  "\334\332\377\223\254\247\377\236\265\260\377\375\375\375\377\207\377" \
-  "\377\377\377\3\256\300\275\377\223\254\247\377\310\324\322\377\266\333" \
-  "\343\342\377\3\233\253\250\377Slg\377p\205\201\377\221\333\343\342\377" \
-  "\1\270\305\303\377\202Slg\377\265\333\343\342\377\4\322\334\332\377\223" \
-  "\254\247\377\237\265\260\377\375\376\375\377\207\377\377\377\377\3\254" \
-  "\277\273\377\223\254\247\377\310\324\322\377\341\333\343\342\377\3\251" \
-  "\274\271\377\223\254\247\377\333\343\342\377\207\377\377\377\377\3\333" \
-  "\343\342\377\223\254\247\377\252\275\272\377\266\333\343\342\377\3\277" \
-  "\312\310\377\237\256\253\377\254\272\270\377\221\333\343\342\377\1\323" \
-  "\334\333\377\202\275\310\306\377\265\333\343\342\377\3\264\305\302\377" \
-  "\223\254\247\377\313\327\324\377\207\377\377\377\377\3\353\360\357\377" \
-  "\223\254\247\377\236\265\260\377\342\333\343\342\377\3\307\323\321\377" \
-  "\223\254\247\377\256\301\275\377\207\377\377\377\377\4\375\375\375\377" \
-  "\236\264\260\377\224\254\247\377\323\334\333\377\377\333\343\342\377" \
-  "\5\333\343\342\377\331\341\340\377\230\260\253\377\225\256\251\377\366" \
-  "\370\367\377\207\377\377\377\377\3\275\314\311\377\223\254\247\377\274" \
-  "\313\311\377\342\333\343\342\377\4\332\342\341\377\235\264\257\377\223" \
-  "\254\247\377\355\361\360\377\207\377\377\377\377\3\312\326\323\377\223" \
-  "\254\247\377\266\306\303\377\377\333\343\342\377\4\333\343\342\377\300" \
-  "\316\314\377\223\254\247\377\271\311\306\377\207\377\377\377\377\4\370" \
-  "\371\371\377\227\257\252\377\226\256\252\377\327\340\336\377\343\333" \
-  "\343\342\377\3\273\313\310\377\223\254\247\377\277\316\313\377\207\377" \
-  "\377\377\377\4\364\367\366\377\225\255\250\377\231\260\254\377\331\341" \
-  "\340\377\310\333\343\342\377\3\307\322\320\377\305\320\316\377\324\334" \
-  "\333\377\264\333\343\342\377\3\241\267\263\377\223\254\247\377\347\354" \
-  "\353\377\207\377\377\377\377\3\317\332\330\377\223\254\247\377\261\303" \
-  "\277\377\344\333\343\342\377\4\326\337\336\377\226\256\251\377\227\257" \
-  "\253\377\371\372\372\377\207\377\377\377\377\3\270\310\305\377\223\254" \
-  "\247\377\301\317\315\377\310\333\343\342\377\3_vr\377Slg\377\254\271" \
-  "\267\377\263\333\343\342\377\3\314\327\325\377\223\254\247\377\250\274" \
-  "\270\377\207\377\377\377\377\4\376\376\376\377\242\270\263\377\223\254" \
-  "\247\377\317\332\330\377\345\333\343\342\377\3\260\302\276\377\223\254" \
-  "\247\377\321\333\331\377\207\377\377\377\377\3\346\353\352\377\223\254" \
-  "\247\377\243\270\264\377\310\333\343\342\377\3_vr\377Slg\377\254\271" \
-  "\267\377\263\333\343\342\377\3\255\300\274\377\223\254\247\377\325\337" \
-  "\335\377\207\377\377\377\377\3\340\347\346\377\223\254\247\377\245\272" \
-  "\266\377\346\333\343\342\377\3\316\331\327\377\223\254\247\377\244\271" \
-  "\265\377\210\377\377\377\377\3\247\273\267\377\223\254\247\377\315\330" \
-  "\326\377\307\333\343\342\377\3^vq\377Slg\377\254\271\267\377\262\333" \
-  "\343\342\377\4\325\336\335\377\225\255\250\377\232\261\255\377\373\374" \
-  "\374\377\207\377\377\377\377\3\263\304\301\377\223\254\247\377\303\321" \
-  "\317\377\347\333\343\342\377\3\244\271\265\377\223\254\247\377\342\351" \
-  "\347\377\207\377\377\377\377\3\324\336\334\377\223\254\247\377\256\301" \
-  "\275\377\304\333\343\342\377\3\317\331\327\377\236\255\253\377i\177{" \
-  "\377\202Slg\377\1\254\271\267\377\262\333\343\342\377\3\271\311\306\377" \
-  "\223\254\247\377\304\322\317\377\207\377\377\377\377\4\361\364\363\377" \
-  "\223\254\247\377\226\256\251\377\332\342\341\377\347\333\343\342\377" \
-  "\3\302\320\316\377\223\254\247\377\265\306\302\377\202\377\377\377\377" \
-  "\3\371\373\372\377\356\361\361\377\375\375\375\377\202\377\377\377\377" \
-  "\4\372\373\373\377\232\261\254\377\225\255\251\377\326\337\336\377\300" \
-  "\333\343\342\377\4\331\341\340\377\263\300\276\377~\222\216\377Uni\377" \
-  "\204Slg\377\1\254\271\267\377\261\333\343\342\377\4\332\342\341\377\233" \
-  "\262\256\377\223\254\247\377\361\364\363\377\207\377\377\377\377\1\304" \
-  "\322\317\377\202\223\254\247\377\1\312\326\324\377\347\333\343\342\377" \
-  "\5\331\341\340\377\232\261\254\377\223\254\247\377\302\320\315\377\244" \
-  "\271\265\377\202\223\254\247\377\7\226\256\251\377\251\275\271\377\331" \
-  "\342\340\377\377\377\377\377\303\321\316\377\223\254\247\377\272\312" \
-  "\307\377\276\333\343\342\377\3\310\322\321\377\224\244\241\377axt\377" \
-  "\207Slg\377\1\254\271\267\377\261\333\343\342\377\3\304\322\317\377\223" \
-  "\254\247\377\263\304\301\377\207\377\377\377\377\5\373\374\374\377\233" \
-  "\262\255\377\225\255\251\377\233\262\256\377\264\305\302\377\350\333" \
-  "\343\342\377\1\260\303\277\377\202\224\255\250\377\13\277\315\312\377" \
-  "\330\341\337\377\345\353\351\377\322\334\332\377\263\304\301\377\223" \
-  "\254\247\377\267\307\304\377\353\357\356\377\223\254\247\377\234\263" \
-  "\257\377\332\342\341\377\272\333\343\342\377\3\326\336\335\377\251\267" \
-  "\265\377t\211\205\377\212Slg\377\1\254\271\267\377\261\333\343\342\377" \
-  "\3\246\272\266\377\223\254\247\377\340\347\346\377\207\377\377\377\377" \
-  "\5\326\337\335\377\223\254\247\377\271\311\306\377\262\304\300\377\246" \
-  "\272\266\377\347\333\343\342\377\4\331\341\340\377\236\264\260\377\240" \
-  "\266\261\377\351\356\355\377\205\377\377\377\377\6\330\341\337\377\226" \
-  "\256\252\377\275\314\311\377\261\303\300\377\223\254\247\377\306\323" \
-  "\320\377\270\333\343\342\377\3\276\312\310\377\211\234\230\377[sn\377" \
-  "\211Slg\377\4Voj\377Umh\377Slg\377\254\271\267\377\260\333\343\342\377" \
-  "\4\320\332\331\377\223\254\247\377\242\267\263\377\376\376\376\377\207" \
-  "\377\377\377\377\5\250\274\270\377\223\254\247\377\346\354\353\377\272" \
-  "\312\307\377\242\267\263\377\347\333\343\342\377\3\265\306\302\377\225" \
-  "\255\250\377\352\357\356\377\207\377\377\377\377\5\322\334\332\377\223" \
-  "\254\247\377\311\325\323\377\223\254\247\377\247\273\270\377\265\333" \
-  "\343\342\377\3\320\332\330\377\237\256\253\377k\201|\377\212Slg\377\6" \
-  "n\204\200\377\242\261\256\377\321\333\331\377_vr\377Slg\377\254\271\267" \
-  "\377\260\333\343\342\377\3\262\303\300\377\223\254\247\377\317\332\330" \
-  "\377\204\377\377\377\377\11\367\371\370\377\352\357\356\377\377\377\377" \
-  "\377\347\355\354\377\223\254\247\377\247\273\267\377\377\377\377\377" \
-  "\244\271\265\377\257\301\276\377\347\333\343\342\377\2\234\263\256\377" \
-  "\303\321\316\377\211\377\377\377\377\5\250\274\270\377\267\307\304\377" \
-  "\241\266\262\377\223\254\247\377\321\333\332\377\261\333\343\342\377" \
-  "\4\331\342\341\377\264\301\277\377\200\223\220\377Vni\377\211Slg\377" \
-  "\3^vq\377\220\241\236\377\303\316\314\377\203\333\343\342\377\3_vr\377" \
-  "Slg\377\254\271\267\377\257\333\343\342\377\1\327\340\337\377\202\227" \
-  "\257\252\377\1\370\371\371\377\203\377\377\377\377\12\352\357\356\377" \
-  "\226\256\252\377\223\254\247\377\277\316\313\377\271\311\306\377\223" \
-  "\254\247\377\325\337\335\377\351\356\355\377\223\254\247\377\277\316" \
-  "\313\377\346\333\343\342\377\3\325\336\335\377\223\254\247\377\335\344" \
-  "\343\377\211\377\377\377\377\5\302\320\315\377\241\267\262\377\315\331" \
-  "\326\377\223\254\247\377\263\304\301\377\241\333\343\342\377\6\274\307" \
-  "\306\377\217\241\235\377t\211\205\377|\217\214\377\242\261\256\377\310" \
-  "\322\321\377\210\333\343\342\377\3\311\323\322\377\225\246\243\377by" \
-  "t\377\213Slg\377\2\245\264\261\377\330\341\340\377\205\333\343\342\377" \
-  "\3_vr\377Slg\377\254\271\267\377\257\333\343\342\377\3\314\327\325\377" \
-  "\223\254\247\377\264\305\301\377\204\377\377\377\377\12\307\324\322\377" \
-  "\226\256\252\377\261\303\300\377\230\260\253\377\224\255\250\377\232" \
-  "\261\255\377\367\371\370\377\244\271\265\377\241\266\262\377\331\341" \
-  "\340\377\346\333\343\342\377\3\312\326\324\377\223\254\247\377\353\360" \
-  "\357\377\211\377\377\377\377\5\320\333\331\377\223\254\247\377\361\364" \
-  "\364\377\223\254\247\377\243\270\264\377\237\333\343\342\377\3\327\340" \
-  "\337\377\217\241\235\377Tlg\377\205Slg\377\1\236\255\253\377\204\333" \
-  "\343\342\377\3\326\337\336\377\253\271\266\377v\212\206\377\212Slg\377" \
-  "\2g}y\377\222\243\240\377\202Slg\377\1\305\320\316\377\206\333\343\342" \
-  "\377\3\264\301\277\377\260\275\273\377\314\326\324\377\257\333\343\342" \
-  "\377\3\316\331\330\377\223\254\247\377\263\304\301\377\204\377\377\377" \
-  "\377\11\351\356\355\377\226\256\251\377\223\254\247\377\251\275\271\377" \
-  "\223\254\247\377\272\312\307\377\244\271\265\377\225\255\251\377\316" \
-  "\331\327\377\347\333\343\342\377\3\326\337\336\377\223\254\247\377\332" \
-  "\343\341\377\211\377\377\377\377\5\277\316\313\377\243\270\264\377\363" \
-  "\365\365\377\223\254\247\377\246\272\266\377\237\333\343\342\377\1\217" \
-  "\241\235\377\203Slg\377\2e{w\377czu\377\203Slg\377\5\254\271\267\377" \
-  "\333\343\342\377\300\313\311\377\213\235\232\377[sn\377\211Slg\377\5" \
-  "Yql\377\206\231\225\377\273\307\305\377\333\343\342\377\316\327\326\377" \
-  "\202Slg\377\1\305\320\316\377\270\333\343\342\377\3\321\334\332\377\223" \
-  "\254\247\377\256\301\275\377\205\377\377\377\377\3\366\370\367\377\346" \
-  "\354\352\377\237\265\260\377\202\223\254\247\377\2\240\266\262\377\315" \
-  "\330\327\377\351\333\343\342\377\2\235\264\257\377\275\314\311\377\210" \
-  "\377\377\377\377\6\375\375\375\377\243\271\264\377\271\311\306\377\356" \
-  "\362\361\377\223\254\247\377\251\275\271\377\236\333\343\342\377\5\274" \
-  "\307\306\377Tlg\377Slg\377e{w\377\300\313\311\377\202\333\343\342\377" \
-  "\5\274\307\306\377axt\377Slg\377Vni\377k\201}\377\212Slg\377\3r\207\203" \
-  "\377\246\265\262\377\324\335\334\377\203\333\343\342\377\1\316\327\326" \
-  "\377\202Slg\377\1\305\320\316\377\270\333\343\342\377\3\324\336\334\377" \
-  "\223\254\247\377\251\275\271\377\206\377\377\377\377\5\335\344\343\377" \
-  "\223\254\247\377\233\262\255\377\300\316\314\377\331\341\340\377\352" \
-  "\333\343\342\377\3\272\312\307\377\223\254\247\377\343\351\350\377\207" \
-  "\377\377\377\377\6\310\325\322\377\224\254\250\377\350\355\354\377\351" \
-  "\356\355\377\223\254\247\377\254\277\273\377\236\333\343\342\377\1\217" \
-  "\241\235\377\202Slg\377\1\300\313\311\377\204\333\343\342\377\1\270\305" \
-  "\303\377\212Slg\377\3_wr\377\222\243\240\377\306\320\317\377\206\333" \
-  "\343\342\377\1\316\327\326\377\202Slg\377\1\305\320\316\377\270\333\343" \
-  "\342\377\3\327\340\337\377\223\254\247\377\245\272\266\377\206\377\377" \
-  "\377\377\3\257\301\276\377\223\254\247\377\306\323\320\377\354\333\343" \
-  "\342\377\4\332\342\341\377\244\271\265\377\233\262\255\377\335\345\343" \
-  "\377\204\377\377\377\377\10\375\376\375\377\312\326\324\377\224\254\250" \
-  "\377\307\324\321\377\377\377\377\377\344\352\351\377\223\254\247\377" \
-  "\257\301\276\377\236\333\343\342\377\3t\211\205\377Slg\377g~y\377\206" \
-  "\333\343\342\377\1\\to\377\206Slg\377\4Uni\377}\221\215\377\261\277\274" \
-  "\377\330\341\340\377\210\333\343\342\377\1\316\327\326\377\202Slg\377" \
-  "\1\305\320\316\377\270\333\343\342\377\3\332\342\341\377\223\254\247" \
-  "\377\240\266\262\377\205\377\377\377\377\4\356\361\361\377\223\254\247" \
-  "\377\234\263\257\377\332\342\341\377\355\333\343\342\377\17\324\336\334" \
-  "\377\250\273\270\377\223\254\247\377\261\303\277\377\312\326\324\377" \
-  "\327\340\336\377\304\322\317\377\246\273\267\377\223\254\247\377\304" \
-  "\322\317\377\375\375\375\377\377\377\377\377\340\347\345\377\223\254" \
-  "\247\377\262\303\300\377\236\333\343\342\377\3v\212\206\377Slg\377f|" \
-  "x\377\206\333\343\342\377\1[sn\377\204Slg\377\3i\177{\377\235\255\252" \
-  "\377\317\330\327\377\213\333\343\342\377\1\316\327\326\377\202Slg\377" \
-  "\1\305\320\316\377\271\333\343\342\377\2\225\255\251\377\234\263\256" \
-  "\377\205\377\377\377\377\3\300\317\314\377\223\254\247\377\272\312\307" \
-  "\377\360\333\343\342\377\7\277\316\313\377\245\272\266\377\227\257\252" \
-  "\377\223\254\247\377\225\255\250\377\257\301\276\377\346\353\352\377" \
-  "\203\377\377\377\377\3\333\343\342\377\223\254\247\377\265\306\302\377" \
-  "\236\333\343\342\377\1\220\242\236\377\202Slg\377\1\277\312\310\377\204" \
-  "\333\343\342\377\1\266\302\300\377\205Slg\377\3z\216\212\377\257\274" \
-  "\272\377\330\340\337\377\213\333\343\342\377\1\316\327\326\377\202Sl" \
-  "g\377\1\305\320\316\377\271\333\343\342\377\2\230\260\253\377\230\257" \
-  "\253\377\204\377\377\377\377\4\371\373\372\377\230\260\253\377\225\255" \
-  "\251\377\326\337\336\377\362\333\343\342\377\4\332\342\341\377\266\307" \
-  "\304\377\223\254\247\377\302\320\315\377\204\377\377\377\377\3\326\337" \
-  "\335\377\223\254\247\377\267\310\305\377\236\333\343\342\377\14\276\311" \
-  "\307\377Tmh\377Slg\377d{v\377\274\307\306\377\333\343\342\377\321\332" \
-  "\331\377\235\255\252\377^vq\377Slg\377Vni\377k\201}\377\204Slg\377\3" \
-  "^uq\377\217\241\235\377\304\317\315\377\211\333\343\342\377\1\316\327" \
-  "\326\377\202Slg\377\1\305\320\316\377\271\333\343\342\377\2\233\262\255" \
-  "\377\223\254\247\377\204\377\377\377\377\3\322\334\332\377\223\254\247" \
-  "\377\256\301\275\377\364\333\343\342\377\4\325\336\335\377\225\255\250" \
-  "\377\231\261\254\377\372\373\373\377\203\377\377\377\377\3\321\334\332" \
-  "\377\223\254\247\377\272\312\307\377\237\333\343\342\377\1\223\244\240" \
-  "\377\203Slg\377\2_vr\377Wpk\377\203Slg\377\5\254\271\267\377\333\343" \
-  "\342\377\300\314\312\377\214\236\233\377\\so\377\204Slg\377\3p\205\201" \
-  "\377\245\263\261\377\324\334\333\377\206\333\343\342\377\1\316\327\326" \
-  "\377\202Slg\377\1\305\320\316\377\271\333\343\342\377\3\236\264\260\377" \
-  "\223\254\247\377\373\374\374\377\203\377\377\377\377\3\245\271\265\377" \
-  "\223\254\247\377\315\330\326\377\365\333\343\342\377\3\255\300\274\377" \
-  "\223\254\247\377\324\336\334\377\203\377\377\377\377\3\315\330\326\377" \
-  "\223\254\247\377\275\314\312\377\237\333\343\342\377\3\330\340\337\377" \
-  "\225\246\243\377Umh\377\205Slg\377\1\236\255\253\377\204\333\343\342" \
-  "\377\4\327\337\336\377\254\271\267\377w\214\210\377Tlg\377\203Slg\377" \
-  "\3Xpk\377\205\230\224\377\272\306\304\377\204\333\343\342\377\1\316\327" \
-  "\326\377\202Slg\377\1\305\320\316\377\271\333\343\342\377\3\241\266\262" \
-  "\377\223\254\247\377\366\370\370\377\202\377\377\377\377\3\343\352\350" \
-  "\377\223\254\247\377\243\270\264\377\366\333\343\342\377\3\314\327\325" \
-  "\377\223\254\247\377\246\273\267\377\203\377\377\377\377\3\307\324\322" \
-  "\377\223\254\247\377\300\316\314\377\241\333\343\342\377\6\302\315\313" \
-  "\377\230\250\245\377}\220\215\377\203\226\222\377\246\265\262\377\311" \
-  "\324\322\377\210\333\343\342\377\3\313\325\323\377\227\250\245\377d{" \
-  "v\377\204Slg\377\5f}x\377\233\253\250\377\315\327\325\377\333\343\342" \
-  "\377\316\327\326\377\202Slg\377\1\305\320\316\377\271\333\343\342\377" \
-  "\3\244\271\265\377\223\254\247\377\362\365\364\377\202\377\377\377\377" \
-  "\3\266\307\303\377\223\254\247\377\301\317\315\377\367\333\343\342\377" \
-  "\3\241\267\263\377\223\254\247\377\345\353\352\377\202\377\377\377\377" \
-  "\3\303\321\316\377\223\254\247\377\303\321\317\377\261\333\343\342\377" \
-  "\4\332\342\341\377\267\304\302\377\203\226\222\377Wpk\377\203Slg\377" \
-  "\3Tmh\377|\217\214\377\245\264\261\377\202Slg\377\1\305\320\316\377\206" \
-  "\333\343\342\377\3\317\331\327\377\316\327\326\377\326\337\336\377\260" \
-  "\333\343\342\377\10\247\273\267\377\223\254\247\377\301\317\314\377\333" \
-  "\343\341\377\344\352\351\377\224\255\250\377\231\260\254\377\331\341" \
-  "\340\377\367\333\343\342\377\10\300\316\314\377\223\254\247\377\265\306" \
-  "\303\377\345\353\351\377\322\335\333\377\250\274\270\377\223\254\247" \
-  "\377\306\323\321\377\264\333\343\342\377\3\323\334\332\377\243\262\257" \
-  "\377o\204\200\377\206Slg\377\1\267\304\302\377\206\333\343\342\377\3" \
-  "_vr\377Slg\377\254\271\267\377\260\333\343\342\377\1\252\275\271\377" \
-  "\205\223\254\247\377\1\266\306\303\377\370\333\343\342\377\2\330\341" \
-  "\340\377\230\260\253\377\205\223\254\247\377\1\311\325\323\377\267\333" \
-  "\343\342\377\3\303\316\314\377\217\240\235\377]up\377\204Slg\377\3r\207" \
-  "\203\377\246\265\262\377\324\335\334\377\203\333\343\342\377\3_vr\377" \
-  "Slg\377\254\271\267\377\260\333\343\342\377\7\327\337\336\377\220\243" \
-  "\237\377k\204\177\377u\216\211\377\205\235\230\377\235\263\257\377\323" \
-  "\334\333\377\371\333\343\342\377\7\267\307\304\377\233\261\255\377~\227" \
-  "\222\377q\212\205\377m\206\201\377\273\310\306\377\332\342\341\377\271" \
-  "\333\343\342\377\4\330\340\337\377\256\274\271\377z\216\212\377Tmh\377" \
-  "\203Slg\377\7Yql\377\206\231\225\377\273\307\305\377\333\343\342\377" \
-  "_vr\377Slg\377\254\271\267\377\261\333\343\342\377\1x\214\210\377\202" \
-  "Slg\377\1~\221\216\377\374\333\343\342\377\5\325\335\334\377axt\377S" \
-  "lg\377Tmh\377\251\270\265\377\275\333\343\342\377\3\315\326\325\377\232" \
-  "\252\247\377f}x\377\204Slg\377\4g}y\377Woj\377Slg\377\254\271\267\377" \
-  "\261\333\343\342\377\1}\220\215\377\202Slg\377\1\240\257\254\377\375" \
-  "\333\343\342\377\1f}x\377\202Slg\377\1\222\243\240\377\300\333\343\342" \
-  "\377\3\272\306\304\377\206\230\225\377Xql\377\204Slg\377\1\254\271\267" \
-  "\377\261\333\343\342\377\4\216\237\234\377Slg\377_wr\377\326\336\335" \
-  "\377\375\333\343\342\377\4r\207\203\377Slg\377axt\377\317\330\327\377" \
-  "\302\333\343\342\377\3\324\334\333\377\246\264\262\377q\207\202\377\202" \
-  "Slg\377\1\254\271\267\377\261\333\343\342\377\3\237\257\254\377Slg\377" \
-  "\240\257\254\377\376\333\343\342\377\3\216\240\235\377Wpk\377\246\264" \
-  "\262\377\306\333\343\342\377\3_vr\377Slg\377\254\271\267\377\261\333" \
-  "\343\342\377\3\260\276\273\377axt\377\326\337\336\377\376\333\343\342" \
-  "\377\2\265\302\277\377v\213\207\377\307\333\343\342\377\3_vr\377Slg\377" \
-  "\254\271\267\377\261\333\343\342\377\2\302\315\313\377\242\261\256\377" \
-  "\377\333\343\342\377\311\333\343\342\377\3z\216\212\377p\205\201\377" \
-  "\266\303\301\377\261\333\343\342\377\2\326\336\335\377\327\340\337\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
-  "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
-  "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
-  "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
-  "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
-  "\333\343\342\377\344\333\343\342\377")
+  "\307\354\354\341\377\2\342\345\333\377\344\346\334\377\377\354\354\341" \
+  "\377\221\354\354\341\377\3\242\256\246\377t\210\201\377\222\241\231\377" \
+  "\315\354\354\341\377\4\325\333\322\377\264\304\275\377\245\271\263\377" \
+  "\230\257\252\377\202\223\254\247\377\4\231\261\253\377\250\273\264\377" \
+  "\266\305\276\377\333\340\326\377\377\354\354\341\377\215\354\354\341" \
+  "\377\3\215\234\225\377Slg\377y\214\205\377\315\354\354\341\377\1\275" \
+  "\312\302\377\203\223\254\247\377\2\237\265\261\377\235\264\257\377\203" \
+  "\223\254\247\377\1\310\322\311\377\377\354\354\341\377\215\354\354\341" \
+  "\377\3\215\234\225\377Slg\377y\214\205\377\315\354\354\341\377\4\275" \
+  "\312\302\377\223\254\247\377\304\321\317\377\370\372\371\377\202\377" \
+  "\377\377\377\4\370\371\371\377\267\307\304\377\223\254\247\377\310\322" \
+  "\311\377\377\354\354\341\377\1\351\351\337\377\214\347\350\335\377\3" \
+  "\213\233\223\377Slg\377y\214\205\377\315\354\354\341\377\3\275\312\302" \
+  "\377\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313" \
+  "\377\223\254\247\377\310\322\311\377\371\354\354\341\377\6\353\353\341" \
+  "\377\307\315\304\377\226\244\234\377x\213\204\377`wr\377Woj\377\217S" \
+  "lg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302\377\223\254\247" \
+  "\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377\223\254\247" \
+  "\377\310\322\311\377\370\354\354\341\377\2\320\324\313\377r\206\200\377" \
+  "\224Slg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302\377\223" \
+  "\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377\223" \
+  "\254\247\377\310\322\311\377\367\354\354\341\377\2\314\321\307\377[s" \
+  "m\377\225Slg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302\377" \
+  "\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377" \
+  "\223\254\247\377\310\322\311\377\366\354\354\341\377\2\351\351\337\377" \
+  "i~x\377\226Slg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302\377" \
+  "\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377" \
+  "\223\254\247\377\310\322\311\377\366\354\354\341\377\1\270\300\267\377" \
+  "\204Slg\377\5`wr\377\231\246\236\377\267\277\266\377\304\313\301\377" \
+  "\322\326\314\377\214\331\334\322\377\3\205\226\217\377Slg\377y\214\205" \
+  "\377\315\354\354\341\377\3\275\312\302\377\223\254\247\377\320\333\330" \
+  "\377\204\377\377\377\377\3\277\316\313\377\223\254\247\377\310\322\311" \
+  "\377\366\354\354\341\377\1\215\234\225\377\203Slg\377\2\225\243\234\377" \
+  "\351\351\337\377\220\354\354\341\377\3\215\234\225\377Slg\377y\214\205" \
+  "\377\315\354\354\341\377\3\275\312\302\377\223\254\247\377\320\333\330" \
+  "\377\204\377\377\377\377\3\277\316\313\377\223\254\247\377\310\322\311" \
+  "\377\366\354\354\341\377\1x\213\205\377\202Slg\377\2y\214\205\377\353" \
+  "\353\340\377\221\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377" \
+  "\315\354\354\341\377\3\275\312\302\377\223\254\247\377\320\333\330\377" \
+  "\204\377\377\377\377\3\277\316\313\377\223\254\247\377\310\322\311\377" \
+  "\366\354\354\341\377\1p\204~\377\202Slg\377\1\250\263\252\377\222\354" \
+  "\354\341\377\3\250\263\252\377~\220\211\377\231\247\237\377\315\354\354" \
+  "\341\377\3\275\312\302\377\223\254\247\377\320\333\330\377\204\377\377" \
+  "\377\377\3\277\316\313\377\223\254\247\377\310\322\311\377\366\354\354" \
+  "\341\377\1\204\225\216\377\202Slg\377\1\301\310\277\377\342\354\354\341" \
+  "\377\3\275\312\302\377\223\254\247\377\320\333\330\377\204\377\377\377" \
+  "\377\3\277\316\313\377\223\254\247\377\310\322\311\377\366\354\354\341" \
+  "\377\1\234\251\241\377\202Slg\377\1\262\274\263\377\342\354\354\341\377" \
+  "\3\275\312\302\377\223\254\247\377\320\333\330\377\204\377\377\377\377" \
+  "\3\277\316\313\377\223\254\247\377\310\322\311\377\366\354\354\341\377" \
+  "\4\326\332\320\377Unh\377Slg\377\221\240\231\377\222\354\354\341\377" \
+  "\3\341\342\330\377\331\334\322\377\336\340\326\377\315\354\354\341\377" \
+  "\3\275\312\302\377\223\254\247\377\320\333\330\377\204\377\377\377\377" \
+  "\3\277\316\313\377\223\254\247\377\310\322\311\377\367\354\354\341\377" \
+  "\4\215\234\225\377Slg\377cys\377\336\340\326\377\221\354\354\341\377" \
+  "\3\215\234\225\377Slg\377y\214\205\377\315\354\354\341\377\3\275\312" \
+  "\302\377\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316" \
+  "\313\377\223\254\247\377\310\322\311\377\367\354\354\341\377\5\346\347" \
+  "\334\377y\214\205\377Slg\377q\205\177\377\345\346\333\377\220\354\354" \
+  "\341\377\3\215\234\225\377Slg\377y\214\205\377\315\354\354\341\377\3" \
+  "\275\312\302\377\223\254\247\377\320\333\330\377\204\377\377\377\377" \
+  "\3\277\316\313\377\223\254\247\377\310\322\311\377\370\354\354\341\377" \
+  "\6\345\346\334\377\206\227\220\377Slg\377e{u\377\243\257\247\377\337" \
+  "\341\326\377\216\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377" \
+  "\315\354\354\341\377\3\275\312\302\377\223\254\247\377\320\333\330\377" \
+  "\204\377\377\377\377\3\277\316\313\377\223\254\247\377\310\322\311\377" \
+  "\372\354\354\341\377\10\303\312\300\377dzt\377Slg\377Voi\377k\200z\377" \
+  "|\216\210\377\214\234\224\377\231\247\237\377\212\232\250\240\377\3n" \
+  "\203}\377Slg\377y\214\205\377\315\354\354\341\377\3\275\312\302\377\223" \
+  "\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377\223" \
+  "\254\247\377\310\322\311\377\371\354\354\341\377\2\273\303\272\377y\214" \
+  "\205\377\223Slg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302" \
+  "\377\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313" \
+  "\377\223\254\247\377\310\322\311\377\370\354\354\341\377\1\232\247\237" \
+  "\377\225Slg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302\377" \
+  "\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377" \
+  "\223\254\247\377\310\322\311\377\367\354\354\341\377\1\242\256\246\377" \
+  "\226Slg\377\1y\214\205\377\315\354\354\341\377\3\275\312\302\377\223" \
+  "\254\247\377\320\333\330\377\204\377\377\377\377\3\277\316\313\377\223" \
+  "\254\247\377\310\322\311\377\366\354\354\341\377\2\341\342\330\377[s" \
+  "m\377\204Slg\377\4Zrm\377o\203}\377{\216\207\377\210\230\221\377\214" \
+  "\214\234\224\377\3i~x\377Slg\377y\214\205\377\315\354\354\341\377\3\275" \
+  "\312\302\377\223\254\247\377\320\333\330\377\204\377\377\377\377\3\277" \
+  "\316\313\377\223\254\247\377\310\322\311\377\366\354\354\341\377\1\244" \
+  "\260\250\377\203Slg\377\3f|v\377\261\272\262\377\345\346\334\377\217" \
+  "\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377\315\354\354\341" \
+  "\377\3\275\312\302\377\223\254\247\377\320\333\330\377\204\377\377\377" \
+  "\377\3\277\316\313\377\223\254\247\377\310\322\311\377\366\354\354\341" \
+  "\377\1\212\232\223\377\202Slg\377\2[sn\377\324\330\316\377\221\354\354" \
+  "\341\377\3\215\234\225\377Slg\377y\214\205\377\315\354\354\341\377\3" \
+  "\275\312\302\377\223\254\247\377\315\331\326\377\204\377\377\377\377" \
+  "\3\274\314\310\377\223\254\247\377\310\322\312\377\366\354\354\341\377" \
+  "\1u\211\202\377\202Slg\377\1\232\247\237\377\222\354\354\341\377\3\215" \
+  "\234\225\377Slg\377y\214\205\377\315\354\354\341\377\3\314\325\314\377" \
+  "\223\254\247\377\264\305\302\377\204\377\377\377\377\3\243\270\264\377" \
+  "\223\254\247\377\327\335\324\377\366\354\354\341\377\1v\212\203\377\202" \
+  "Slg\377\1\265\276\265\377\222\354\354\341\377\3\330\333\321\377\312\320" \
+  "\306\377\323\327\315\377\315\354\354\341\377\4\344\346\334\377\223\254" \
+  "\247\377\231\261\254\377\375\376\376\377\202\377\377\377\377\4\362\365" \
+  "\365\377\223\254\247\377\230\260\252\377\353\353\340\377\366\354\354" \
+  "\341\377\1\215\235\225\377\202Slg\377\1\301\310\277\377\340\354\354\341" \
+  "\377\6\337\342\330\377\271\307\275\377\223\253\242\377\215\250\242\377" \
+  "\223\254\247\377\346\354\353\377\202\377\377\377\377\6\325\337\335\377" \
+  "\223\254\247\377\212\246\240\377\230\257\246\377\276\313\301\377\343" \
+  "\345\333\377\364\354\354\341\377\1\270\300\267\377\202Slg\377\1\242\256" \
+  "\246\377\336\354\354\341\377\3\320\330\316\377\216\250\237\377p\221\212" \
+  "\377\202o\221\212\377\3\203\240\232\377\223\254\247\377\310\325\322\377" \
+  "\202\377\377\377\377\3\267\310\305\377\223\254\247\377~\234\226\377\202" \
+  "o\221\212\377\3q\222\213\377\226\256\246\377\330\336\324\377\362\354" \
+  "\354\341\377\4\353\353\340\377k\200z\377Slg\377|\216\210\377\222\354" \
+  "\354\341\377\3\256\270\257\377\207\230\221\377\240\255\245\377\307\354" \
+  "\354\341\377\2\333\337\324\377\230\257\247\377\205o\221\212\377\3\207" \
+  "\243\233\377\223\254\247\377\250\274\270\377\202\344\352\351\377\3\233" \
+  "\262\256\377\223\254\247\377\203\240\231\377\204o\221\212\377\3q\223" \
+  "\214\377\242\266\256\377\342\345\332\377\361\354\354\341\377\4\315\322" \
+  "\311\377\\tn\377Slg\377\253\265\255\377\221\354\354\341\377\3\215\234" \
+  "\225\377Slg\377y\214\205\377\306\354\354\341\377\2\302\315\304\377s\224" \
+  "\215\377\203o\221\212\377\5\211\244\234\377\267\305\274\377\333\340\326" \
+  "\377\351\352\337\377\225\256\251\377\204\223\254\247\377\5\235\263\256" \
+  "\377\354\354\341\377\331\336\324\377\262\302\271\377\201\236\227\377" \
+  "\203o\221\212\377\2y\230\221\377\316\326\314\377\361\354\354\341\377" \
+  "\5\312\317\306\377`wq\377Unh\377\253\265\255\377\346\347\334\377\217" \
+  "\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377\304\354\354\341" \
+  "\377\3\353\354\341\377\256\277\265\377p\221\212\377\202o\221\212\377" \
+  "\2\201\236\227\377\302\315\304\377\204\354\354\341\377\1\272\310\300" \
+  "\377\204\254\276\267\377\1\303\317\306\377\203\354\354\341\377\3\352" \
+  "\352\337\377\271\307\275\377{\232\222\377\202o\221\212\377\2r\224\214" \
+  "\377\273\310\277\377\356\354\354\341\377\1\353\353\341\377\202\347\350" \
+  "\335\377\11\334\337\325\377\211\231\222\377Slg\377]to\377\226\244\234" \
+  "\377\270\300\267\377\311\316\305\377\331\334\322\377\346\347\334\377" \
+  "\212\347\350\335\377\3\213\233\223\377Slg\377y\214\205\377\304\354\354" \
+  "\341\377\1\244\270\257\377\203o\221\212\377\2\242\266\256\377\351\352" \
+  "\340\377\220\354\354\341\377\2\346\350\334\377\227\256\245\377\203o\221" \
+  "\212\377\1\266\305\274\377\355\354\354\341\377\1\320\324\313\377\227" \
+  "Slg\377\1y\214\205\377\303\354\354\341\377\1\272\310\276\377\202o\221" \
+  "\212\377\2q\223\214\377\270\306\274\377\223\354\354\341\377\6\353\354" \
+  "\341\377\255\276\264\377p\221\212\377o\221\212\377q\223\214\377\313\324" \
+  "\312\377\354\354\354\341\377\1\320\324\313\377\227Slg\377\1y\214\205" \
+  "\377\302\354\354\341\377\5\315\326\313\377r\223\213\377o\221\212\377" \
+  "p\222\213\377\305\317\305\377\226\354\354\341\377\1\265\304\273\377\202" \
+  "o\221\212\377\2x\230\220\377\333\340\325\377\353\354\354\341\377\1\320" \
+  "\324\313\377\227Slg\377\1y\214\205\377\301\354\354\341\377\2\351\352" \
+  "\337\377\177\234\224\377\202o\221\212\377\1\263\303\272\377\230\354\354" \
+  "\341\377\1\240\265\254\377\202o\221\212\377\1\216\247\240\377\353\354" \
+  "\354\341\377\1\320\324\313\377\227Slg\377\1y\214\205\377\301\354\354" \
+  "\341\377\1\264\303\272\377\202o\221\212\377\1\227\256\245\377\231\354" \
+  "\354\341\377\2\351\352\340\377\210\243\233\377\202o\221\212\377\1\310" \
+  "\322\310\377\352\354\354\341\377\1\320\324\313\377\202Slg\377\1\300\307" \
+  "\276\377\222\331\334\322\377\3\205\226\217\377Slg\377y\214\205\377\300" \
+  "\354\354\341\377\5\344\346\334\377x\230\220\377o\221\212\377r\223\213" \
+  "\377\332\337\324\377\232\354\354\341\377\1\315\326\313\377\202o\221\212" \
+  "\377\2\205\241\231\377\353\353\340\377\351\354\354\341\377\1\320\324" \
+  "\313\377\202Slg\377\1\317\324\312\377\222\354\354\341\377\3\215\234\225" \
+  "\377Slg\377y\214\205\377\300\354\354\341\377\1\264\303\272\377\202o\221" \
+  "\212\377\1\243\267\256\377\234\354\354\341\377\1\224\254\244\377\202" \
+  "o\221\212\377\1\305\320\306\377\351\354\354\341\377\1\320\324\313\377" \
+  "\202Slg\377\1\317\324\312\377\222\354\354\341\377\3\215\234\225\377S" \
+  "lg\377y\214\205\377\300\354\354\341\377\4\214\246\237\377o\221\212\377" \
+  "p\222\213\377\340\343\331\377\234\354\354\341\377\1\316\326\314\377\202" \
+  "o\221\212\377\1\236\263\253\377\351\354\354\341\377\1\320\324\313\377" \
+  "\202Slg\377\1\317\324\312\377\222\354\354\341\377\3\234\251\241\377j" \
+  "\200z\377\213\233\223\377\277\354\354\341\377\4\342\345\332\377p\222" \
+  "\213\377o\221\212\377\214\246\236\377\235\354\354\341\377\5\353\353\340" \
+  "\377{\231\222\377o\221\212\377y\231\221\377\352\353\340\377\350\354\354" \
+  "\341\377\1\352\352\337\377\202\336\340\326\377\1\352\352\337\377\324" \
+  "\354\354\341\377\1\275\312\300\377\202o\221\212\377\1\262\302\271\377" \
+  "\236\354\354\341\377\1\241\265\255\377\202o\221\212\377\1\317\327\315" \
+  "\377\377\354\354\341\377\301\354\354\341\377\1\255\276\264\377\202o\221" \
+  "\212\377\1\317\327\314\377\236\354\354\341\377\1\276\312\301\377\202" \
+  "o\221\212\377\1\274\311\277\377\377\354\354\341\377\301\354\354\341\377" \
+  "\1\237\264\254\377\202o\221\212\377\1\334\340\326\377\236\354\354\341" \
+  "\377\1\313\324\312\377\202o\221\212\377\1\260\300\267\377\377\354\354" \
+  "\341\377\301\354\354\341\377\4\222\252\242\377o\221\212\377p\222\213" \
+  "\377\351\352\340\377\236\354\354\341\377\1\330\335\323\377\202o\221\212" \
+  "\377\1\244\270\257\377\357\354\354\341\377\14\331\334\322\377\257\271" \
+  "\260\377\212\232\223\377p\204~\377e{u\377[sm\377_vq\377j\177y\377x\213" \
+  "\204\377\232\247\237\377\277\306\275\377\350\350\336\377\305\354\354" \
+  "\341\377\3\210\243\233\377o\221\212\377w\227\217\377\237\354\354\341" \
+  "\377\1\342\345\332\377\202o\221\212\377\1\233\261\250\377\355\354\354" \
+  "\341\377\3\320\324\313\377\206\227\220\377Tmh\377\212Slg\377\3bys\377" \
+  "\245\261\251\377\345\346\334\377\303\354\354\341\377\4\223\253\243\377" \
+  "o\221\212\377p\221\212\377\351\352\337\377\236\354\354\341\377\1\326" \
+  "\334\322\377\202o\221\212\377\1\245\270\257\377\353\354\354\341\377\3" \
+  "\353\353\341\377\246\261\251\377Uni\377\216Slg\377\2k\200z\377\322\326" \
+  "\314\377\302\354\354\341\377\1\240\265\254\377\202o\221\212\377\1\333" \
+  "\340\325\377\236\354\354\341\377\1\311\323\311\377\202o\221\212\377\1" \
+  "\261\301\270\377\352\354\354\341\377\2\353\353\341\377\212\232\223\377" \
+  "\221Slg\377\2Xqk\377\306\314\303\377\301\354\354\341\377\1\256\277\265" \
+  "\377\202o\221\212\377\1\314\325\313\377\236\354\354\341\377\1\274\311" \
+  "\277\377\202o\221\212\377\1\276\312\301\377\337\354\354\341\377\2\322" \
+  "\326\314\377\311\316\305\377\211\354\354\341\377\1\231\247\237\377\207" \
+  "Slg\377\6Xpk\377^vp\377dzt\377axr\377[sn\377Tmh\377\206Slg\377\2]to\377" \
+  "\322\326\314\377\300\354\354\341\377\1\300\314\303\377\202o\221\212\377" \
+  "\1\256\277\266\377\236\354\354\341\377\1\236\263\253\377\202o\221\212" \
+  "\377\1\323\332\317\377\335\354\354\341\377\2\353\353\341\377~\220\211" \
+  "\377\202Slg\377\2m\202|\377\344\345\333\377\206\354\354\341\377\1\312" \
+  "\317\306\377\204Slg\377\4h~x\377\231\247\237\377\302\311\300\377\334" \
+  "\336\324\377\205\354\354\341\377\5\347\350\335\377\320\324\313\377\262" \
+  "\273\263\377\205\226\217\377Xpk\377\203Slg\377\1s\207\201\377\300\354" \
+  "\354\341\377\4\343\346\333\377q\223\214\377o\221\212\377\210\243\233" \
+  "\377\235\354\354\341\377\5\352\352\337\377x\230\220\377o\221\212\377" \
+  "{\232\222\377\353\354\341\377\335\354\354\341\377\1\300\307\276\377\204" \
+  "Slg\377\1\256\270\260\377\206\354\354\341\377\1x\213\204\377\202Slg\377" \
+  "\3`wr\377\265\276\265\377\353\353\340\377\214\354\354\341\377\2\335\337" \
+  "\325\377\217\236\227\377\203Slg\377\1\272\302\271\377\300\354\354\341" \
+  "\377\1\220\251\241\377\202o\221\212\377\1\333\340\326\377\234\354\354" \
+  "\341\377\1\312\323\311\377\202o\221\212\377\1\241\265\255\377\336\354" \
+  "\354\341\377\1\246\262\252\377\204Slg\377\1\226\244\235\377\205\354\354" \
+  "\341\377\1\326\331\317\377\202Slg\377\2i~x\377\333\335\323\377\220\354" \
+  "\354\341\377\1\256\270\257\377\202Slg\377\1~\220\211\377\300\354\354" \
+  "\341\377\1\271\307\275\377\202o\221\212\377\1\235\263\252\377\206\354" \
+  "\354\341\377\1\353\353\340\377\216\354\354\341\377\1\353\353\341\377" \
+  "\206\354\354\341\377\1\216\247\240\377\202o\221\212\377\1\311\323\311" \
+  "\377\336\354\354\341\377\2\337\341\327\377Wpj\377\203Slg\377\1\320\324" \
+  "\313\377\205\354\354\341\377\4\251\264\253\377Slg\377Tmg\377\316\323" \
+  "\311\377\222\354\354\341\377\4\211\231\222\377Slg\377Xpk\377\346\347" \
+  "\334\377\277\354\354\341\377\5\347\351\335\377{\232\222\377o\221\212" \
+  "\377p\222\213\377\325\334\321\377\205\354\354\341\377\4\271\307\300\377" \
+  "\253\275\267\377\321\330\317\377\353\353\341\377\210\354\354\341\377" \
+  "\4\352\352\337\377\314\325\314\377\246\272\263\377\306\321\310\377\205" \
+  "\354\354\341\377\1\307\321\307\377\202o\221\212\377\1\212\245\235\377" \
+  "\340\354\354\341\377\4\314\321\310\377\215\235\225\377\205\226\217\377" \
+  "\300\307\276\377\206\354\354\341\377\3\210\230\221\377Slg\377x\213\205" \
+  "\377\223\354\354\341\377\1\315\322\311\377\202Slg\377\1\312\320\306\377" \
+  "\300\354\354\341\377\1\272\310\276\377\202o\221\212\377\2\220\251\241" \
+  "\377\353\354\341\377\203\354\354\341\377\2\350\351\336\377\230\260\252" \
+  "\377\202\223\254\247\377\3\236\264\256\377\303\316\306\377\345\347\335" \
+  "\377\204\354\354\341\377\3\342\344\332\377\275\312\303\377\232\261\254" \
+  "\377\202\223\254\247\377\1\242\267\261\377\204\354\354\341\377\2\347" \
+  "\351\335\377\203\237\227\377\202o\221\212\377\1\316\326\314\377\352\354" \
+  "\354\341\377\3z\215\206\377Slg\377\235\252\242\377\224\354\354\341\377" \
+  "\3[sn\377Slg\377\275\304\273\377\300\354\354\341\377\2\352\353\340\377" \
+  "\203\237\227\377\202o\221\212\377\1\251\273\263\377\203\354\354\341\377" \
+  "\4\307\322\311\377\223\254\247\377\243\270\264\377\244\271\264\377\202" \
+  "\223\254\247\377\6\226\256\251\377\265\304\275\377\345\347\334\377\340" \
+  "\343\331\377\257\300\271\377\224\255\250\377\202\223\254\247\377\4\251" \
+  "\275\271\377\236\264\260\377\223\254\247\377\325\334\322\377\202\354" \
+  "\354\341\377\2\353\354\341\377\227\256\246\377\202o\221\212\377\1\224" \
+  "\254\244\377\353\354\354\341\377\3o\203}\377Slg\377\256\270\257\377\224" \
+  "\354\354\341\377\3k\200z\377Slg\377\261\273\262\377\301\354\354\341\377" \
+  "\2\325\333\321\377t\224\216\377\202o\221\212\377\1\273\310\277\377\202" \
+  "\354\354\341\377\22\242\267\261\377\223\254\247\377\332\343\341\377\377" \
+  "\377\377\377\341\350\347\377\263\305\301\377\224\255\250\377\223\254" \
+  "\247\377\311\323\312\377\276\313\303\377\223\254\247\377\225\256\251" \
+  "\377\271\311\306\377\347\355\354\377\377\377\377\377\315\330\326\377" \
+  "\223\254\247\377\260\301\272\377\202\354\354\341\377\1\252\274\264\377" \
+  "\202o\221\212\377\2|\233\223\377\340\343\331\377\353\354\354\341\377" \
+  "\3w\212\204\377Slg\377\242\256\246\377\224\354\354\341\377\3`wq\377S" \
+  "lg\377\272\302\271\377\302\354\354\341\377\2\303\316\304\377p\221\212" \
+  "\377\202o\221\212\377\5\255\276\264\377\325\334\322\377\223\254\247\377" \
+  "\235\264\257\377\375\375\375\377\203\377\377\377\377\6\321\334\332\377" \
+  "\223\254\247\377\252\274\266\377\242\267\261\377\223\254\247\377\337" \
+  "\346\345\377\203\377\377\377\377\5\367\370\370\377\226\256\251\377\224" \
+  "\255\250\377\340\343\332\377\240\265\254\377\202o\221\212\377\2s\223" \
+  "\215\377\323\332\317\377\342\354\354\341\377\4\346\347\334\377\261\272" \
+  "\262\377\247\262\252\377\340\342\327\377\206\354\354\341\377\3\204\225" \
+  "\216\377Slg\377\204\225\216\377\223\354\354\341\377\1\331\334\322\377" \
+  "\202Slg\377\1\307\315\303\377\303\354\354\341\377\1\256\277\266\377\203" \
+  "o\221\212\377\3\224\255\247\377\223\254\247\377\310\325\322\377\203\377" \
+  "\377\377\377\2\361\364\364\377\252\276\272\377\203\223\254\247\377\3" \
+  "\224\255\250\377\266\307\304\377\367\371\370\377\203\377\377\377\377" \
+  "\3\273\313\307\377\223\254\247\377\220\251\243\377\202o\221\212\377\2" \
+  "p\221\212\377\300\314\303\377\342\354\354\341\377\2\347\350\335\377c" \
+  "ys\377\202Slg\377\2Xpk\377\334\337\325\377\205\354\354\341\377\4\236" \
+  "\253\243\377Slg\377Xpk\377\336\340\326\377\222\354\354\341\377\4\234" \
+  "\251\241\377Slg\377Tmh\377\340\342\327\377\304\354\354\341\377\6\271" \
+  "\307\275\377q\223\214\377s\224\215\377\223\254\247\377\225\255\250\377" \
+  "\364\367\366\377\202\377\377\377\377\12\352\357\356\377\230\260\253\377" \
+  "\232\262\255\377\315\331\326\377\347\355\354\377\344\352\351\377\306" \
+  "\323\321\377\225\256\251\377\235\264\257\377\363\366\365\377\202\377" \
+  "\377\377\377\6\351\356\355\377\223\254\247\377\220\252\244\377p\222\213" \
+  "\377u\226\216\377\306\320\306\377\343\354\354\341\377\1\262\273\263\377" \
+  "\204Slg\377\1\241\255\245\377\205\354\354\341\377\1\313\320\307\377\202" \
+  "Slg\377\2~\220\211\377\351\351\337\377\220\354\354\341\377\4\312\317" \
+  "\306\377Voi\377Slg\377u\210\202\377\306\354\354\341\377\4\314\325\313" \
+  "\377\206\242\234\377\223\254\247\377\267\310\304\377\202\377\377\377" \
+  "\377\4\374\375\375\377\245\272\266\377\237\265\261\377\363\366\365\377" \
+  "\204\377\377\377\377\3\352\357\356\377\227\257\253\377\261\303\300\377" \
+  "\203\377\377\377\377\4\251\275\271\377\223\254\247\377\206\242\234\377" \
+  "\327\334\322\377\344\354\354\341\377\1\262\273\263\377\204Slg\377\1\241" \
+  "\255\245\377\205\354\354\341\377\2\353\353\341\377h~x\377\202Slg\377" \
+  "\2x\213\205\377\331\334\322\377\215\354\354\341\377\3\353\353\340\377" \
+  "\261\272\262\377Xqk\377\202Slg\377\1\251\264\254\377\306\354\354\341" \
+  "\377\4\352\353\340\377\232\261\254\377\223\254\247\377\344\352\351\377" \
+  "\202\377\377\377\377\3\336\345\344\377\223\254\247\377\337\347\345\377" \
+  "\206\377\377\377\377\3\317\332\330\377\223\254\247\377\356\362\362\377" \
+  "\202\377\377\377\377\3\327\340\336\377\223\254\247\377\246\272\263\377" \
+  "\345\354\354\341\377\2\347\350\335\377cys\377\202Slg\377\2Xpk\377\334" \
+  "\337\325\377\206\354\354\341\377\1\270\300\267\377\203Slg\377\4Voi\377" \
+  "\215\235\225\377\300\307\276\377\347\347\335\377\210\354\354\341\377" \
+  "\3\327\332\320\377\250\263\252\377l\201{\377\203Slg\377\2e{u\377\350" \
+  "\350\336\377\306\354\354\341\377\3\315\326\315\377\223\254\247\377\246" \
+  "\272\266\377\203\377\377\377\377\3\310\324\322\377\225\255\250\377\374" \
+  "\375\375\377\206\377\377\377\377\3\360\364\363\377\223\254\247\377\330" \
+  "\341\340\377\202\377\377\377\377\4\374\374\374\377\233\263\256\377\223" \
+  "\254\247\377\333\340\326\377\345\354\354\341\377\4\346\347\334\377\261" \
+  "\272\262\377\247\262\252\377\340\342\327\377\207\354\354\341\377\2\353" \
+  "\353\341\377~\220\211\377\205Slg\377\11Tmh\377f|v\377y\214\205\377\200" \
+  "\222\213\377\205\226\217\377\203\224\215\377}\217\210\377r\206\177\377" \
+  "[sn\377\205Slg\377\2Tmh\377\276\305\274\377\307\354\354\341\377\3\250" \
+  "\273\264\377\223\254\247\377\323\335\333\377\203\377\377\377\377\2\277" \
+  "\316\313\377\231\261\254\377\207\377\377\377\377\3\370\371\371\377\223" \
+  "\254\247\377\320\333\331\377\203\377\377\377\377\3\305\323\320\377\223" \
+  "\254\247\377\266\305\276\377\361\354\354\341\377\2\344\345\333\377o\204" \
+  "}\377\222Slg\377\1\251\264\254\377\307\354\354\341\377\4\334\340\326" \
+  "\377\223\254\247\377\231\261\254\377\372\373\373\377\203\377\377\377" \
+  "\377\3\325\336\334\377\223\254\247\377\361\364\363\377\206\377\377\377" \
+  "\377\3\341\350\346\377\223\254\247\377\346\353\352\377\203\377\377\377" \
+  "\377\4\362\365\364\377\224\255\250\377\226\256\251\377\346\350\335\377" \
+  "\361\354\354\341\377\2\341\343\330\377\200\222\213\377\217Slg\377\2Z" \
+  "rl\377\262\274\263\377\310\354\354\341\377\3\266\305\276\377\223\254" \
+  "\247\377\302\320\315\377\204\377\377\377\377\3\361\364\364\377\226\256" \
+  "\252\377\267\310\304\377\205\377\377\377\377\4\375\375\375\377\250\274" \
+  "\270\377\234\263\256\377\373\374\374\377\204\377\377\377\377\3\264\305" \
+  "\302\377\223\254\247\377\304\317\307\377\362\354\354\341\377\3\353\353" \
+  "\341\377\254\267\256\377e{u\377\213Slg\377\3Tmh\377\204\225\216\377\325" \
+  "\330\316\377\310\354\354\341\377\4\346\350\335\377\227\257\251\377\223" \
+  "\254\247\377\356\362\362\377\205\377\377\377\377\4\316\332\327\377\223" \
+  "\254\247\377\273\313\307\377\370\372\371\377\202\377\377\377\377\4\363" \
+  "\366\365\377\260\302\276\377\223\254\247\377\334\344\342\377\205\377" \
+  "\377\377\377\3\341\350\347\377\223\254\247\377\237\265\257\377\364\354" \
+  "\354\341\377\4\352\352\337\377\271\301\270\377\215\235\225\377h~x\377" \
+  "\205Slg\377\4Wpj\377x\213\205\377\235\252\242\377\325\330\316\377\312" \
+  "\354\354\341\377\3\305\320\307\377\223\254\247\377\260\302\277\377\206" \
+  "\377\377\377\377\2\376\376\376\377\312\326\324\377\202\225\255\250\377" \
+  "\5\243\270\264\377\241\267\262\377\223\254\247\377\230\257\253\377\325" \
+  "\337\335\377\207\377\377\377\377\3\243\270\264\377\223\254\247\377\323" \
+  "\332\320\377\367\354\354\341\377\6\350\350\336\377\335\337\325\377\323" \
+  "\327\315\377\327\332\320\377\342\343\331\377\353\353\340\377\315\354" \
+  "\354\341\377\3\240\265\257\377\223\254\247\377\336\345\344\377\210\377" \
+  "\377\377\377\6\240\266\262\377\223\254\247\377\246\272\263\377\243\270" \
+  "\262\377\223\254\247\377\260\302\276\377\210\377\377\377\377\3\320\333" \
+  "\331\377\223\254\247\377\255\277\270\377\377\354\354\341\377\312\354" \
+  "\354\341\377\4\323\332\321\377\223\254\247\377\240\266\262\377\376\376" \
+  "\376\377\207\377\377\377\377\10\341\350\346\377\223\254\247\377\236\264" \
+  "\256\377\353\353\341\377\347\350\336\377\227\257\252\377\224\255\250" \
+  "\377\361\364\364\377\207\377\377\377\377\4\371\372\372\377\230\260\253" \
+  "\377\224\255\247\377\340\343\331\377\354\354\354\341\377\1\322\326\314" \
+  "\377\205\226\244\234\377\1\253\266\255\377\325\354\354\341\377\3\256" \
+  "\277\270\377\223\254\247\377\314\330\326\377\210\377\377\377\377\3\264" \
+  "\305\302\377\223\254\247\377\302\316\306\377\202\354\354\341\377\3\267" \
+  "\306\276\377\223\254\247\377\305\322\317\377\210\377\377\377\377\3\277" \
+  "\316\313\377\223\254\247\377\273\311\301\377\354\354\354\341\377\1\250" \
+  "\263\252\377\205Slg\377\1y\214\205\377\324\354\354\341\377\4\340\344" \
+  "\331\377\224\255\247\377\226\256\251\377\367\370\370\377\207\377\377" \
+  "\377\377\4\361\365\364\377\224\255\250\377\225\256\251\377\345\347\334" \
+  "\377\202\354\354\341\377\4\334\341\327\377\223\254\247\377\233\262\255" \
+  "\377\374\374\374\377\207\377\377\377\377\4\354\360\357\377\223\254\247" \
+  "\377\231\261\253\377\351\352\337\377\353\354\354\341\377\1\213\233\224" \
+  "\377\205Slg\377\1\205\226\217\377\324\354\354\341\377\3\274\311\302\377" \
+  "\223\254\247\377\273\313\307\377\210\377\377\377\377\3\305\323\320\377" \
+  "\223\254\247\377\264\304\274\377\204\354\354\341\377\3\250\273\265\377" \
+  "\223\254\247\377\326\337\336\377\210\377\377\377\377\3\255\300\274\377" \
+  "\223\254\247\377\312\323\313\377\353\354\354\341\377\1{\216\207\377\203" \
+  "Slg\377\2\226\244\234\377\341\342\330\377\324\354\354\341\377\4\351\352" \
+  "\337\377\232\261\253\377\223\254\247\377\350\355\354\377\207\377\377" \
+  "\377\377\4\374\374\374\377\233\263\256\377\223\254\247\377\331\336\325" \
+  "\377\204\354\354\341\377\3\316\326\315\377\223\254\247\377\251\275\271" \
+  "\377\210\377\377\377\377\3\333\343\341\377\223\254\247\377\244\271\262" \
+  "\377\353\354\354\341\377\1p\204~\377\202Slg\377\1\203\224\215\377\326" \
+  "\354\354\341\377\3\312\324\313\377\223\254\247\377\251\275\271\377\210" \
+  "\377\377\377\377\3\327\340\336\377\223\254\247\377\245\271\263\377\205" \
+  "\354\354\341\377\4\352\353\340\377\234\262\255\377\223\254\247\377\350" \
+  "\355\354\377\207\377\377\377\377\4\375\375\375\377\236\264\260\377\223" \
+  "\254\247\377\330\336\324\377\352\354\354\341\377\1v\212\203\377\202S" \
+  "lg\377\1\266\277\266\377\326\354\354\341\377\3\245\271\263\377\223\254" \
+  "\247\377\327\340\336\377\210\377\377\377\377\3\251\275\271\377\223\254" \
+  "\247\377\313\324\313\377\206\354\354\341\377\3\277\314\304\377\223\254" \
+  "\247\377\272\312\307\377\210\377\377\377\377\3\311\326\323\377\223\254" \
+  "\247\377\263\303\274\377\352\354\354\341\377\1\211\231\222\377\202Sl" \
+  "g\377\1\303\311\300\377\325\354\354\341\377\4\331\336\324\377\223\254" \
+  "\247\377\233\262\256\377\374\374\374\377\207\377\377\377\377\4\351\356" \
+  "\355\377\223\254\247\377\232\261\253\377\351\352\337\377\206\354\354" \
+  "\341\377\4\343\346\333\377\224\255\250\377\226\256\251\377\366\370\370" \
+  "\377\207\377\377\377\377\4\364\367\366\377\225\256\251\377\225\256\250" \
+  "\377\344\346\334\377\351\354\354\341\377\1\242\256\246\377\202Slg\377" \
+  "\1\251\264\253\377\222\354\354\341\377\3\344\345\332\377\336\340\326" \
+  "\377\341\343\330\377\300\354\354\341\377\3\263\303\274\377\223\254\247" \
+  "\377\305\322\320\377\210\377\377\377\377\3\273\313\310\377\223\254\247" \
+  "\377\274\312\302\377\210\354\354\341\377\3\261\302\273\377\223\254\247" \
+  "\377\314\330\325\377\210\377\377\377\377\3\267\310\305\377\223\254\247" \
+  "\377\301\315\305\377\351\354\354\341\377\4\334\336\324\377Uni\377Slg" \
+  "\377\212\232\223\377\222\354\354\341\377\3\215\234\225\377Slg\377y\214" \
+  "\205\377\277\354\354\341\377\4\345\347\334\377\225\256\251\377\224\255" \
+  "\250\377\361\365\364\377\207\377\377\377\377\4\367\370\370\377\226\256" \
+  "\251\377\224\255\247\377\341\344\332\377\210\354\354\341\377\4\326\334" \
+  "\323\377\223\254\247\377\240\266\261\377\376\376\376\377\207\377\377" \
+  "\377\377\4\345\353\352\377\223\254\247\377\235\263\256\377\353\353\340" \
+  "\377\351\354\354\341\377\4\215\234\225\377Slg\377\\tn\377\326\332\320" \
+  "\377\221\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377\277\354" \
+  "\354\341\377\3\302\316\305\377\223\254\247\377\264\305\302\377\210\377" \
+  "\377\377\377\3\315\330\326\377\223\254\247\377\256\277\271\377\212\354" \
+  "\354\341\377\3\243\267\261\377\223\254\247\377\335\345\343\377\210\377" \
+  "\377\377\377\3\246\273\267\377\223\254\247\377\320\330\317\377\351\354" \
+  "\354\341\377\5\347\347\335\377u\211\202\377Slg\377m\202|\377\345\346" \
+  "\334\377\220\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377\276" \
+  "\354\354\341\377\4\353\353\340\377\235\264\256\377\223\254\247\377\341" \
+  "\350\347\377\207\377\377\377\377\4\376\376\376\377\241\266\262\377\223" \
+  "\254\247\377\323\332\321\377\212\354\354\341\377\3\310\322\312\377\223" \
+  "\254\247\377\260\302\276\377\210\377\377\377\377\3\323\335\333\377\223" \
+  "\254\247\377\252\275\266\377\352\354\354\341\377\6\341\342\330\377\201" \
+  "\223\214\377Slg\377l\201{\377\265\276\265\377\352\352\340\377\216\354" \
+  "\354\341\377\3\215\234\225\377Slg\377y\214\205\377\276\354\354\341\377" \
+  "\3\320\330\317\377\223\254\247\377\243\270\264\377\210\377\377\377\377" \
+  "\3\336\346\344\377\223\254\247\377\240\265\257\377\213\354\354\341\377" \
+  "\4\350\351\336\377\230\260\252\377\223\254\247\377\356\362\362\377\207" \
+  "\377\377\377\377\4\372\373\373\377\231\261\254\377\223\254\247\377\336" \
+  "\342\330\377\347\354\354\341\377\1\344\345\333\377\203\301\310\277\377" \
+  "\1\213\233\224\377\202Slg\377\5g}w\377\215\235\225\377\237\254\244\377" \
+  "\261\272\262\377\300\307\276\377\212\301\310\277\377\3|\217\210\377S" \
+  "lg\377y\214\205\377\276\354\354\341\377\3\253\275\266\377\223\254\247" \
+  "\377\320\333\330\377\210\377\377\377\377\3\261\303\277\377\223\254\247" \
+  "\377\305\320\310\377\214\354\354\341\377\3\271\310\300\377\223\254\247" \
+  "\377\301\317\315\377\210\377\377\377\377\3\302\320\315\377\223\254\247" \
+  "\377\271\307\300\377\347\354\354\341\377\1\320\324\313\377\227Slg\377" \
+  "\1y\214\205\377\275\354\354\341\377\4\336\342\330\377\223\254\247\377" \
+  "\230\260\253\377\371\372\372\377\207\377\377\377\377\4\357\363\362\377" \
+  "\223\254\247\377\227\257\251\377\346\350\335\377\214\354\354\341\377" \
+  "\4\336\342\330\377\223\254\247\377\231\261\254\377\372\373\373\377\207" \
+  "\377\377\377\377\4\357\363\362\377\223\254\247\377\230\260\252\377\350" \
+  "\351\336\377\346\354\354\341\377\1\320\324\313\377\227Slg\377\1y\214" \
+  "\205\377\275\354\354\341\377\3\271\307\300\377\223\254\247\377\276\315" \
+  "\312\377\210\377\377\377\377\3\302\320\316\377\223\254\247\377\267\306" \
+  "\276\377\216\354\354\341\377\3\253\275\267\377\223\254\247\377\323\335" \
+  "\333\377\210\377\377\377\377\3\261\303\277\377\223\254\247\377\307\321" \
+  "\311\377\346\354\354\341\377\1\320\324\313\377\227Slg\377\1y\214\205" \
+  "\377\274\354\354\341\377\4\350\351\336\377\230\260\252\377\223\254\247" \
+  "\377\354\360\357\377\207\377\377\377\377\4\373\374\374\377\232\261\255" \
+  "\377\223\254\247\377\334\340\327\377\216\354\354\341\377\3\320\330\317" \
+  "\377\223\254\247\377\246\272\266\377\210\377\377\377\377\3\336\346\344" \
+  "\377\223\254\247\377\242\267\261\377\346\354\354\341\377\1\320\324\313" \
+  "\377\202Slg\377\1bys\377\222f|v\377\3Zrm\377Slg\377y\214\205\377\274" \
+  "\354\354\341\377\3\310\322\311\377\223\254\247\377\255\300\274\377\210" \
+  "\377\377\377\377\3\324\336\334\377\223\254\247\377\250\273\265\377\217" \
+  "\354\354\341\377\4\353\353\340\377\235\264\256\377\223\254\247\377\344" \
+  "\352\351\377\207\377\377\377\377\4\376\376\376\377\240\266\262\377\223" \
+  "\254\247\377\326\334\322\377\345\354\354\341\377\1\320\324\313\377\202" \
+  "Slg\377\1\317\324\312\377\222\354\354\341\377\3\215\234\225\377Slg\377" \
+  "y\214\205\377\274\354\354\341\377\3\242\267\261\377\223\254\247\377\332" \
+  "\343\341\377\210\377\377\377\377\3\246\273\267\377\223\254\247\377\316" \
+  "\326\315\377\220\354\354\341\377\3\302\316\306\377\223\254\247\377\267" \
+  "\310\304\377\210\377\377\377\377\3\315\330\326\377\223\254\247\377\260" \
+  "\301\272\377\345\354\354\341\377\1\320\324\313\377\202Slg\377\1\317\324" \
+  "\312\377\222\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377\273" \
+  "\354\354\341\377\4\326\334\323\377\223\254\247\377\236\264\260\377\375" \
+  "\375\375\377\207\377\377\377\377\4\346\353\352\377\223\254\247\377\233" \
+  "\262\254\377\352\353\340\377\220\354\354\341\377\4\345\347\334\377\225" \
+  "\256\251\377\225\255\250\377\364\367\366\377\207\377\377\377\377\4\367" \
+  "\370\370\377\226\257\252\377\224\255\250\377\343\345\333\377\344\354" \
+  "\354\341\377\1\320\324\313\377\202Slg\377\1\317\324\312\377\222\354\354" \
+  "\341\377\3\215\234\225\377Slg\377y\214\205\377\273\354\354\341\377\3" \
+  "\261\301\272\377\223\254\247\377\311\325\323\377\210\377\377\377\377" \
+  "\3\270\311\305\377\223\254\247\377\277\314\304\377\222\354\354\341\377" \
+  "\3\263\303\274\377\223\254\247\377\310\325\322\377\210\377\377\377\377" \
+  "\3\273\313\310\377\223\254\247\377\277\313\303\377\344\354\354\341\377" \
+  "\1\325\330\316\377\202j\200z\377\1\323\327\315\377\222\354\354\341\377" \
+  "\3\264\275\264\377\221\240\230\377\250\263\252\377\272\354\354\341\377" \
+  "\4\343\345\333\377\224\255\250\377\225\255\250\377\364\367\366\377\207" \
+  "\377\377\377\377\4\365\367\367\377\225\256\251\377\224\255\250\377\343" \
+  "\345\333\377\222\354\354\341\377\4\331\336\324\377\223\254\247\377\235" \
+  "\264\257\377\375\375\375\377\207\377\377\377\377\4\351\356\355\377\223" \
+  "\254\247\377\233\262\254\377\352\353\340\377\377\354\354\341\377\267" \
+  "\354\354\341\377\3\277\314\304\377\223\254\247\377\267\310\305\377\210" \
+  "\377\377\377\377\3\312\326\324\377\223\254\247\377\261\301\272\377\224" \
+  "\354\354\341\377\3\245\271\263\377\223\254\247\377\332\343\341\377\210" \
+  "\377\377\377\377\3\251\275\271\377\223\254\247\377\315\326\315\377\366" \
+  "\354\354\341\377\1\336\340\326\377\276\354\354\341\377\4\352\353\340" \
+  "\377\233\262\254\377\223\254\247\377\345\353\352\377\207\377\377\377" \
+  "\377\4\375\376\376\377\236\264\260\377\223\254\247\377\326\334\323\377" \
+  "\210\354\354\341\377\4\327\335\324\377\254\276\270\377\273\311\301\377" \
+  "\330\336\325\377\210\354\354\341\377\3\312\324\313\377\223\254\247\377" \
+  "\255\300\274\377\210\377\377\377\377\3\327\340\337\377\223\254\247\377" \
+  "\250\273\264\377\366\354\354\341\377\4f|v\377^up\377{\215\207\377\276" \
+  "\305\274\377\273\354\354\341\377\3\316\326\315\377\223\254\247\377\246" \
+  "\273\267\377\210\377\377\377\377\3\333\344\342\377\223\254\247\377\242" \
+  "\267\261\377\210\354\354\341\377\6\335\341\330\377\224\255\250\377\235" \
+  "\264\257\377\230\260\254\377\233\262\255\377\352\353\340\377\207\354" \
+  "\354\341\377\4\351\352\337\377\232\261\253\377\223\254\247\377\354\360" \
+  "\357\377\207\377\377\377\377\4\374\375\375\377\233\263\256\377\223\254" \
+  "\247\377\333\340\326\377\342\354\354\341\377\1\321\325\313\377\202Wp" \
+  "j\377\1\314\321\307\377\217\354\354\341\377\1f|v\377\203Slg\377\2\207" \
+  "\227\220\377\352\352\337\377\271\354\354\341\377\3\250\273\265\377\223" \
+  "\254\247\377\323\335\333\377\210\377\377\377\377\3\256\301\275\377\223" \
+  "\254\247\377\310\322\311\377\210\354\354\341\377\6\300\315\305\377\224" \
+  "\255\250\377\366\370\367\377\345\353\352\377\223\254\247\377\316\326" \
+  "\315\377\210\354\354\341\377\3\274\311\302\377\223\254\247\377\276\315" \
+  "\312\377\210\377\377\377\377\3\306\323\320\377\223\254\247\377\266\305" \
+  "\276\377\342\354\354\341\377\1\320\324\313\377\202Slg\377\1\312\320\306" \
+  "\377\217\354\354\341\377\1i~x\377\204Slg\377\1\254\266\256\377\270\354" \
+  "\354\341\377\4\334\340\327\377\223\254\247\377\231\261\254\377\372\373" \
+  "\373\377\207\377\377\377\377\4\355\361\360\377\223\254\247\377\230\260" \
+  "\252\377\350\351\336\377\210\354\354\341\377\6\272\310\300\377\232\261" \
+  "\254\377\377\377\377\377\370\372\371\377\223\254\247\377\310\322\311" \
+  "\377\210\354\354\341\377\4\340\344\331\377\224\255\247\377\230\260\253" \
+  "\377\371\372\372\377\207\377\377\377\377\4\362\365\364\377\224\255\250" \
+  "\377\227\257\251\377\346\350\335\377\341\354\354\341\377\1\320\324\313" \
+  "\377\202Slg\377\1\312\320\306\377\217\354\354\341\377\7\353\353\341\377" \
+  "\335\337\325\377\260\272\261\377cys\377Slg\377_vq\377\350\351\336\377" \
+  "\267\354\354\341\377\3\267\306\276\377\223\254\247\377\302\320\315\377" \
+  "\210\377\377\377\377\3\277\316\313\377\223\254\247\377\271\310\300\377" \
+  "\211\354\354\341\377\6\272\310\300\377\232\261\254\377\377\377\377\377" \
+  "\370\372\371\377\223\254\247\377\310\322\311\377\211\354\354\341\377" \
+  "\3\256\277\270\377\223\254\247\377\320\333\330\377\210\377\377\377\377" \
+  "\3\264\305\302\377\223\254\247\377\305\320\307\377\341\354\354\341\377" \
+  "\1\320\324\313\377\202Slg\377\1\312\320\306\377\222\354\354\341\377\1" \
+  "\312\317\306\377\202Slg\377\1\325\331\317\377\266\354\354\341\377\4\346" \
+  "\350\335\377\227\257\251\377\223\254\247\377\357\363\362\377\207\377" \
+  "\377\377\377\4\371\372\372\377\230\260\253\377\223\254\247\377\336\342" \
+  "\330\377\211\354\354\341\377\6\272\310\300\377\232\261\254\377\377\377" \
+  "\377\377\370\372\371\377\223\254\247\377\310\322\311\377\211\354\354" \
+  "\341\377\3\323\332\321\377\223\254\247\377\243\270\264\377\210\377\377" \
+  "\377\377\3\342\351\347\377\223\254\247\377\240\265\257\377\341\354\354" \
+  "\341\377\1\320\324\313\377\202Slg\377\1\312\320\306\377\223\354\354\341" \
+  "\377\3`wq\377Slg\377\301\310\277\377\266\354\354\341\377\3\305\320\310" \
+  "\377\223\254\247\377\260\302\277\377\210\377\377\377\377\3\321\334\332" \
+  "\377\223\254\247\377\253\275\266\377\212\354\354\341\377\6\272\310\300" \
+  "\377\232\261\254\377\377\377\377\377\370\372\371\377\223\254\247\377" \
+  "\310\322\311\377\212\354\354\341\377\3\240\265\257\377\223\254\247\377" \
+  "\341\350\347\377\210\377\377\377\377\3\243\270\264\377\223\254\247\377" \
+  "\323\332\321\377\340\354\354\341\377\1\320\324\313\377\202Slg\377\1\312" \
+  "\320\306\377\223\354\354\341\377\3f|v\377Slg\377\262\274\263\377\266" \
+  "\354\354\341\377\6\240\265\257\377\223\254\247\377\336\346\344\377\377" \
+  "\377\377\377\366\370\370\377\364\367\366\377\205\377\377\377\377\3\244" \
+  "\271\265\377\223\254\247\377\320\330\317\377\212\354\354\341\377\6\272" \
+  "\310\300\377\232\261\254\377\377\377\377\377\370\372\371\377\223\254" \
+  "\247\377\310\322\311\377\212\354\354\341\377\3\305\320\307\377\223\254" \
+  "\247\377\264\305\302\377\205\377\377\377\377\6\361\364\363\377\372\373" \
+  "\373\377\377\377\377\377\320\333\331\377\223\254\247\377\256\277\270" \
+  "\377\340\354\354\341\377\1\320\324\313\377\202Slg\377\1\312\320\306\377" \
+  "\222\354\354\341\377\4\326\331\317\377Tmg\377Slg\377\303\311\300\377" \
+  "\241\354\354\341\377\1\347\350\335\377\207\261\301\270\377\1\347\350" \
+  "\335\377\213\354\354\341\377\11\323\332\321\377\223\254\247\377\240\266" \
+  "\262\377\353\357\356\377\272\312\307\377\226\256\251\377\225\255\250" \
+  "\377\267\310\304\377\347\354\353\377\202\377\377\377\377\4\343\351\350" \
+  "\377\223\254\247\377\235\264\256\377\353\353\340\377\212\354\354\341" \
+  "\377\6\272\310\300\377\232\261\254\377\377\377\377\377\370\372\371\377" \
+  "\223\254\247\377\310\322\311\377\212\354\354\341\377\4\346\350\335\377" \
+  "\227\257\251\377\224\255\250\377\361\365\364\377\202\377\377\377\377" \
+  "\11\340\347\345\377\261\303\277\377\224\255\250\377\231\260\253\377\300" \
+  "\317\314\377\354\360\360\377\230\260\253\377\224\255\247\377\340\344" \
+  "\331\377\213\354\354\341\377\1\337\343\330\377\206\261\301\270\377\1" \
+  "\263\303\272\377\305\354\354\341\377\1\336\340\326\377\206\324\330\316" \
+  "\377\1\275\304\273\377\202Slg\377\1\270\300\267\377\216\324\330\316\377" \
+  "\5\323\327\315\377\312\317\306\377\300\307\276\377\240\254\244\377e{" \
+  "u\377\202Slg\377\1\327\332\320\377\241\354\354\341\377\1\340\344\331" \
+  "\377\207o\221\212\377\1u\226\217\377\213v\226\217\377\16\212\245\240" \
+  "\377\223\254\247\377\314\330\326\377\243\270\264\377\232\262\255\377" \
+  "\303\321\316\377\306\323\320\377\234\263\257\377\233\262\256\377\374" \
+  "\375\375\377\377\377\377\377\265\306\303\377\223\254\247\377\204\240" \
+  "\232\377\213v\226\217\377\6\206\242\234\377\230\260\253\377\377\377\377" \
+  "\377\370\372\371\377\223\254\247\377\202\237\231\377\213v\226\217\377" \
+  "\16\210\243\236\377\223\254\247\377\305\323\320\377\377\377\377\377\365" \
+  "\367\367\377\225\256\251\377\241\266\262\377\313\327\325\377\275\314" \
+  "\311\377\227\257\252\377\260\302\277\377\277\316\313\377\223\254\247" \
+  "\377\206\242\234\377\213v\226\217\377\1t\225\216\377\206o\221\212\377" \
+  "\1r\223\214\377\305\354\354\341\377\1\215\234\225\377\236Slg\377\2]t" \
+  "o\377\351\351\337\377\241\354\354\341\377\1\340\344\331\377\222o\221" \
+  "\212\377\6t\224\216\377\223\254\247\377\226\256\251\377\334\344\342\377" \
+  "\223\254\247\377\333\343\341\377\202\377\377\377\377\7\344\352\351\377" \
+  "\223\254\247\377\330\341\337\377\363\366\365\377\224\255\250\377\222" \
+  "\253\246\377r\223\214\377\213o\221\212\377\6\203\240\232\377\230\260" \
+  "\253\377\377\377\377\377\370\372\371\377\223\254\247\377~\234\226\377" \
+  "\213o\221\212\377\7v\226\217\377\223\254\247\377\233\262\256\377\374" \
+  "\374\374\377\312\326\324\377\223\254\247\377\361\365\364\377\202\377" \
+  "\377\377\377\6\315\331\326\377\224\255\250\377\337\346\344\377\223\254" \
+  "\247\377\220\252\245\377p\222\213\377\221o\221\212\377\1r\223\214\377" \
+  "\305\354\354\341\377\1\215\234\225\377\236Slg\377\1\253\265\255\377\242" \
+  "\354\354\341\377\1\340\344\331\377\222o\221\212\377\6\202\240\232\377" \
+  "\223\254\247\377\273\313\307\377\304\321\317\377\223\254\247\377\367" \
+  "\371\371\377\202\377\377\377\377\6\375\376\376\377\230\260\253\377\272" \
+  "\312\306\377\307\324\321\377\223\254\247\377\206\242\234\377\214o\221" \
+  "\212\377\6\203\240\232\377\230\260\253\377\377\377\377\377\370\372\371" \
+  "\377\223\254\247\377~\234\226\377\214o\221\212\377\5\213\246\240\377" \
+  "\223\254\247\377\327\340\336\377\254\300\274\377\243\270\264\377\203" \
+  "\377\377\377\377\6\352\357\356\377\223\254\247\377\321\334\332\377\255" \
+  "\300\274\377\223\254\247\377}\233\225\377\221o\221\212\377\1r\223\214" \
+  "\377\305\354\354\341\377\1\215\234\225\377\235Slg\377\2\204\225\216\377" \
+  "\352\352\340\377\242\354\354\341\377\1\340\344\331\377\221o\221\212\377" \
+  "\3p\222\213\377\220\252\245\377\223\254\247\377\202\351\356\355\377\2" \
+  "\223\254\247\377\323\335\333\377\202\377\377\377\377\6\335\345\343\377" \
+  "\223\254\247\377\335\345\344\377\234\263\257\377\223\254\247\377w\227" \
+  "\220\377\214o\221\212\377\6\203\240\232\377\230\260\253\377\377\377\377" \
+  "\377\370\372\371\377\223\254\247\377~\234\226\377\214o\221\212\377\6" \
+  "|\232\224\377\223\254\247\377\251\275\271\377\321\334\332\377\223\254" \
+  "\247\377\353\357\356\377\202\377\377\377\377\6\305\323\320\377\225\255" \
+  "\250\377\364\367\366\377\333\343\341\377\223\254\247\377\214\247\241" \
+  "\377\221o\221\212\377\1r\223\214\377\305\354\354\341\377\1\215\234\225" \
+  "\377\230Slg\377\5Tmg\377axr\377s\207\200\377\207\230\221\377\311\317" \
+  "\305\377\244\354\354\341\377\1\340\344\331\377\207o\221\212\377\1\207" \
+  "\243\233\377\211\212\245\235\377\3\215\250\241\377\223\254\247\377\251" \
+  "\275\271\377\202\377\377\377\377\11\252\276\272\377\224\255\250\377\262" \
+  "\304\300\377\265\306\303\377\225\255\250\377\240\266\262\377\327\340" \
+  "\337\377\223\254\247\377\221\253\245\377\215\212\245\235\377\6\217\251" \
+  "\242\377\231\260\253\377\377\377\377\377\370\372\371\377\223\254\247" \
+  "\377\216\250\241\377\215\212\245\235\377\16\222\253\246\377\223\254\247" \
+  "\377\344\352\351\377\227\257\253\377\227\257\252\377\272\312\307\377" \
+  "\254\277\273\377\223\254\247\377\267\310\305\377\377\377\377\377\375" \
+  "\376\376\377\236\264\260\377\223\254\247\377\214\247\237\377\211\212" \
+  "\245\235\377\1\204\241\231\377\206o\221\212\377\1r\223\214\377\305\354" \
+  "\354\341\377\1\352\352\337\377\206\347\350\335\377\1\314\321\310\377" \
+  "\202Slg\377\1\307\315\303\377\216\347\350\335\377\1\352\352\337\377\250" \
+  "\354\354\341\377\1\351\352\337\377\207\305\317\305\377\1\351\352\337" \
+  "\377\211\354\354\341\377\3\245\271\263\377\223\254\247\377\327\340\336" \
+  "\377\202\377\377\377\377\11\366\370\367\377\313\327\325\377\237\266\261" \
+  "\377\235\264\257\377\310\324\322\377\363\366\365\377\253\277\273\377" \
+  "\223\254\247\377\312\324\313\377\215\354\354\341\377\6\272\310\300\377" \
+  "\232\261\254\377\377\377\377\377\370\372\371\377\223\254\247\377\310" \
+  "\322\311\377\215\354\354\341\377\11\277\313\303\377\223\254\247\377\273" \
+  "\313\307\377\356\362\361\377\301\317\315\377\231\260\254\377\245\272" \
+  "\266\377\321\334\332\377\371\372\372\377\202\377\377\377\377\3\311\326" \
+  "\323\377\223\254\247\377\263\303\274\377\211\354\354\341\377\1\343\346" \
+  "\333\377\206\305\317\305\377\1\307\321\307\377\314\354\354\341\377\1" \
+  "\320\324\313\377\202Slg\377\1\312\320\306\377\310\354\354\341\377\4\331" \
+  "\336\325\377\223\254\247\377\233\263\256\377\374\375\375\377\204\377" \
+  "\377\377\377\7\376\376\376\377\375\375\375\377\377\377\377\377\352\357" \
+  "\356\377\223\254\247\377\232\261\253\377\351\352\337\377\215\354\354" \
+  "\341\377\6\272\310\300\377\232\261\254\377\377\377\377\377\370\372\371" \
+  "\377\223\254\247\377\310\322\311\377\215\354\354\341\377\6\343\345\333" \
+  "\377\224\255\250\377\226\256\251\377\367\370\370\377\377\377\377\377" \
+  "\374\374\374\377\205\377\377\377\377\1\364\367\366\377\202\225\256\251" \
+  "\377\1\345\347\334\377\334\354\354\341\377\1\320\324\313\377\202Slg\377" \
+  "\1\312\320\306\377\310\354\354\341\377\3\264\304\274\377\223\254\247" \
+  "\377\305\323\320\377\210\377\377\377\377\3\275\314\311\377\223\254\247" \
+  "\377\274\311\302\377\216\354\354\341\377\6\272\310\300\377\232\261\254" \
+  "\377\377\377\377\377\370\372\371\377\223\254\247\377\310\322\311\377" \
+  "\216\354\354\341\377\3\260\301\272\377\223\254\247\377\315\330\326\377" \
+  "\210\377\377\377\377\3\270\310\305\377\223\254\247\377\302\316\305\377" \
+  "\334\354\354\341\377\1\331\334\322\377\202\207\230\221\377\1\326\331" \
+  "\317\377\307\354\354\341\377\4\345\347\334\377\225\256\251\377\224\255" \
+  "\250\377\362\365\364\377\207\377\377\377\377\4\367\371\371\377\227\257" \
+  "\252\377\224\255\247\377\340\344\331\377\216\354\354\341\377\6\272\310" \
+  "\300\377\232\261\254\377\377\377\377\377\370\372\371\377\223\254\247" \
+  "\377\310\322\311\377\216\354\354\341\377\4\326\334\322\377\223\254\247" \
+  "\377\240\266\262\377\376\376\376\377\207\377\377\377\377\4\345\353\352" \
+  "\377\223\254\247\377\235\264\256\377\353\353\340\377\377\354\354\341" \
+  "\377\247\354\354\341\377\3\302\316\306\377\223\254\247\377\264\305\302" \
+  "\377\210\377\377\377\377\3\316\332\327\377\223\254\247\377\256\277\270" \
+  "\377\217\354\354\341\377\6\272\310\300\377\232\261\254\377\377\377\377" \
+  "\377\370\372\371\377\223\254\247\377\310\322\311\377\217\354\354\341" \
+  "\377\3\242\267\261\377\223\254\247\377\336\346\344\377\210\377\377\377" \
+  "\377\3\246\273\267\377\223\254\247\377\320\330\317\377\377\354\354\341" \
+  "\377\246\354\354\341\377\4\353\353\341\377\236\264\256\377\223\254\247" \
+  "\377\341\350\347\377\210\377\377\377\377\3\241\267\263\377\223\254\247" \
+  "\377\323\332\321\377\217\354\354\341\377\6\272\310\300\377\232\261\254" \
+  "\377\377\377\377\377\370\372\371\377\223\254\247\377\310\322\311\377" \
+  "\217\354\354\341\377\3\307\321\311\377\223\254\247\377\261\303\277\377" \
+  "\210\377\377\377\377\3\324\336\334\377\223\254\247\377\253\275\266\377" \
+  "\377\354\354\341\377\246\354\354\341\377\3\321\330\317\377\223\254\247" \
+  "\377\243\270\264\377\210\377\377\377\377\3\340\347\345\377\223\254\247" \
+  "\377\240\265\257\377\220\354\354\341\377\6\306\321\311\377\223\254\247" \
+  "\377\337\346\345\377\321\334\331\377\223\254\247\377\324\333\321\377" \
+  "\217\354\354\341\377\4\350\351\336\377\230\257\252\377\223\254\247\377" \
+  "\357\363\362\377\207\377\377\377\377\4\372\373\373\377\231\261\254\377" \
+  "\223\254\247\377\336\342\330\377\351\354\354\341\377\6\343\344\332\377" \
+  "\277\306\275\377\245\261\251\377\234\251\241\377\254\266\256\377\325" \
+  "\330\316\377\265\354\354\341\377\3\253\275\267\377\223\254\247\377\320" \
+  "\333\331\377\210\377\377\377\377\3\262\304\301\377\223\254\247\377\305" \
+  "\320\307\377\220\354\354\341\377\2\351\352\340\377\240\266\257\377\202" \
+  "\223\254\247\377\1\251\274\266\377\221\354\354\341\377\3\271\307\300" \
+  "\377\223\254\247\377\302\320\315\377\210\377\377\377\377\3\302\320\316" \
+  "\377\223\254\247\377\271\307\300\377\334\354\354\341\377\1\303\312\300" \
+  "\377\204\301\310\277\377\1\337\341\326\377\206\354\354\341\377\2\267" \
+  "\277\266\377axr\377\205Slg\377\2\201\222\213\377\335\337\325\377\262" \
+  "\354\354\341\377\4\337\342\330\377\223\254\247\377\230\260\253\377\371" \
+  "\372\372\377\207\377\377\377\377\4\361\364\363\377\224\255\250\377\227" \
+  "\257\251\377\346\350\335\377\221\354\354\341\377\1\334\340\326\377\202" \
+  "\312\324\313\377\1\341\344\331\377\221\354\354\341\377\4\336\342\330" \
+  "\377\223\254\247\377\231\261\254\377\372\373\373\377\207\377\377\377" \
+  "\377\4\357\363\362\377\223\254\247\377\230\260\252\377\350\351\336\377" \
+  "\332\354\354\341\377\1\323\327\315\377\205Slg\377\1\274\304\273\377\205" \
+  "\354\354\341\377\1\261\273\262\377\210Slg\377\2g}w\377\334\337\325\377" \
+  "\261\354\354\341\377\3\272\310\300\377\223\254\247\377\277\316\313\377" \
+  "\210\377\377\377\377\3\304\322\317\377\223\254\247\377\266\305\276\377" \
+  "\250\354\354\341\377\3\252\275\266\377\223\254\247\377\324\336\334\377" \
+  "\210\377\377\377\377\3\261\303\277\377\223\254\247\377\310\322\311\377" \
+  "\332\354\354\341\377\1\240\254\244\377\205Slg\377\1\274\304\273\377\204" \
+  "\354\354\341\377\2\322\326\314\377Xqk\377\211Slg\377\1z\215\206\377\260" \
+  "\354\354\341\377\4\350\351\336\377\230\260\252\377\223\254\247\377\354" \
+  "\360\357\377\207\377\377\377\377\4\373\374\374\377\233\262\255\377\223" \
+  "\254\247\377\334\340\326\377\250\354\354\341\377\3\317\327\316\377\223" \
+  "\254\247\377\246\273\267\377\210\377\377\377\377\3\336\346\344\377\223" \
+  "\254\247\377\242\267\261\377\332\354\354\341\377\1m\202|\377\202Slg\377" \
+  "\4Yql\377\234\251\241\377\301\310\277\377\346\347\334\377\204\354\354" \
+  "\341\377\1\204\225\216\377\204Slg\377\4Xqk\377v\212\203\377y\214\206" \
+  "\377[sm\377\203Slg\377\1\276\305\274\377\257\354\354\341\377\3\310\322" \
+  "\312\377\223\254\247\377\255\300\274\377\210\377\377\377\377\3\325\337" \
+  "\335\377\223\254\247\377\250\273\264\377\251\354\354\341\377\4\353\353" \
+  "\340\377\235\263\255\377\223\254\247\377\345\353\352\377\207\377\377" \
+  "\377\377\4\376\376\376\377\241\266\262\377\223\254\247\377\326\334\323" \
+  "\377\330\354\354\341\377\1\323\327\315\377\202Slg\377\2i~x\377\323\327" \
+  "\315\377\206\354\354\341\377\2\334\337\325\377Uni\377\203Slg\377\2s\207" \
+  "\201\377\332\335\323\377\202\354\354\341\377\2\352\352\337\377\222\241" \
+  "\231\377\202Slg\377\1\203\224\215\377\257\354\354\341\377\3\243\267\261" \
+  "\377\223\254\247\377\333\343\341\377\210\377\377\377\377\3\250\274\270" \
+  "\377\223\254\247\377\315\326\315\377\252\354\354\341\377\3\301\315\305" \
+  "\377\223\254\247\377\270\310\305\377\210\377\377\377\377\3\315\330\326" \
+  "\377\223\254\247\377\261\301\272\377\330\354\354\341\377\1\257\271\260" \
+  "\377\202Slg\377\1\303\311\300\377\207\354\354\341\377\1\240\255\245\377" \
+  "\203Slg\377\2Yql\377\331\334\322\377\205\354\354\341\377\4~\220\211\377" \
+  "Slg\377Xqk\377\352\352\337\377\255\354\354\341\377\4\326\334\323\377" \
+  "\223\254\247\377\236\264\260\377\375\375\375\377\207\377\377\377\377" \
+  "\4\347\355\354\377\223\254\247\377\233\262\254\377\352\353\340\377\252" \
+  "\354\354\341\377\4\344\346\334\377\225\256\250\377\225\256\251\377\364" \
+  "\367\366\377\207\377\377\377\377\4\367\371\370\377\226\257\252\377\224" \
+  "\255\250\377\343\345\333\377\327\354\354\341\377\3\234\251\241\377Sl" \
+  "g\377u\210\202\377\210\354\354\341\377\1l\201{\377\203Slg\377\1\235\252" \
+  "\242\377\206\354\354\341\377\1\301\310\277\377\202Slg\377\1\321\325\313" \
+  "\377\255\354\354\341\377\3\261\302\273\377\223\254\247\377\311\326\323" \
+  "\377\210\377\377\377\377\3\272\312\306\377\223\254\247\377\277\313\303" \
+  "\377\254\354\354\341\377\3\263\303\274\377\223\254\247\377\311\326\323" \
+  "\377\210\377\377\377\377\3\273\313\310\377\223\254\247\377\277\314\304" \
+  "\377\327\354\354\341\377\3\210\231\222\377Slg\377\223\242\232\377\207" \
+  "\354\354\341\377\1\326\331\317\377\203Slg\377\2Tmg\377\330\333\321\377" \
+  "\206\354\354\341\377\4\350\350\336\377Tmg\377Slg\377\275\304\273\377" \
+  "\254\354\354\341\377\4\343\346\333\377\225\255\250\377\225\256\251\377" \
+  "\364\367\366\377\207\377\377\377\377\4\366\370\367\377\226\256\251\377" \
+  "\224\255\250\377\343\345\333\377\254\354\354\341\377\4\330\336\324\377" \
+  "\223\254\247\377\236\264\260\377\375\376\376\377\207\377\377\377\377" \
+  "\4\351\356\355\377\223\254\247\377\233\262\254\377\352\353\340\377\326" \
+  "\354\354\341\377\3u\211\202\377Slg\377\251\264\253\377\207\354\354\341" \
+  "\377\1\246\261\251\377\203Slg\377\1y\214\205\377\210\354\354\341\377" \
+  "\3`wr\377Slg\377\264\275\264\377\254\354\354\341\377\3\277\314\304\377" \
+  "\223\254\247\377\267\310\305\377\210\377\377\377\377\3\313\327\325\377" \
+  "\223\254\247\377\260\301\272\377\256\354\354\341\377\3\244\270\262\377" \
+  "\223\254\247\377\333\343\342\377\210\377\377\377\377\3\252\276\272\377" \
+  "\223\254\247\377\315\326\315\377\326\354\354\341\377\3t\210\201\377S" \
+  "lg\377\250\263\253\377\207\354\354\341\377\1s\207\201\377\203Slg\377" \
+  "\1\261\273\262\377\210\354\354\341\377\3k\200z\377Slg\377\260\272\261" \
+  "\377\253\354\354\341\377\4\352\353\340\377\234\262\255\377\223\254\247" \
+  "\377\345\353\352\377\207\377\377\377\377\4\376\376\376\377\237\265\261" \
+  "\377\223\254\247\377\326\334\322\377\256\354\354\341\377\3\311\323\312" \
+  "\377\223\254\247\377\256\301\275\377\210\377\377\377\377\3\327\340\337" \
+  "\377\223\254\247\377\250\273\265\377\326\354\354\341\377\3\207\230\221" \
+  "\377Slg\377\227\245\236\377\206\354\354\341\377\1\326\331\317\377\203" \
+  "Slg\377\2Woj\377\342\343\331\377\210\354\354\341\377\3Zrm\377Slg\377" \
+  "\270\301\270\377\253\354\354\341\377\3\316\326\315\377\223\254\247\377" \
+  "\246\273\267\377\210\377\377\377\377\3\335\345\343\377\223\254\247\377" \
+  "\242\267\261\377\257\354\354\341\377\4\351\352\337\377\231\260\253\377" \
+  "\223\254\247\377\354\361\360\377\207\377\377\377\377\4\374\375\375\377" \
+  "\233\263\256\377\223\254\247\377\334\340\326\377\325\354\354\341\377" \
+  "\3\232\250\240\377Slg\377x\213\204\377\206\354\354\341\377\1\235\252" \
+  "\242\377\203Slg\377\1\201\223\214\377\210\354\354\341\377\1\341\342\330" \
+  "\377\202Slg\377\1\303\311\300\377\253\354\354\341\377\3\250\273\265\377" \
+  "\223\254\247\377\324\336\334\377\210\377\377\377\377\3\257\302\276\377" \
+  "\223\254\247\377\307\322\311\377\260\354\354\341\377\3\273\311\301\377" \
+  "\223\254\247\377\277\316\313\377\210\377\377\377\377\3\306\323\320\377" \
+  "\223\254\247\377\266\305\276\377\325\354\354\341\377\1\256\270\260\377" \
+  "\202Slg\377\1\322\326\314\377\204\354\354\341\377\2\332\335\323\377Z" \
+  "rl\377\203Slg\377\1\271\301\270\377\210\354\354\341\377\1\267\300\267" \
+  "\377\202Slg\377\1\332\335\323\377\252\354\354\341\377\4\334\341\327\377" \
+  "\223\254\247\377\231\261\254\377\372\373\373\377\207\377\377\377\377" \
+  "\4\356\362\361\377\223\254\247\377\230\260\252\377\350\351\336\377\260" \
+  "\354\354\341\377\4\340\343\331\377\223\254\247\377\230\260\253\377\371" \
+  "\372\372\377\207\377\377\377\377\4\362\365\364\377\224\255\250\377\227" \
+  "\257\251\377\346\350\335\377\324\354\354\341\377\11\340\342\327\377Z" \
+  "rl\377Slg\377e{u\377\312\320\306\377\353\353\341\377\354\354\341\377" \
+  "\325\330\316\377p\205~\377\203Slg\377\2axr\377\351\351\337\377\207\354" \
+  "\354\341\377\4\353\353\340\377k\200z\377Slg\377[sn\377\253\354\354\341" \
+  "\377\3\267\306\276\377\223\254\247\377\302\320\315\377\210\377\377\377" \
+  "\377\3\301\317\315\377\223\254\247\377\271\307\300\377\262\354\354\341" \
+  "\377\3\254\276\270\377\223\254\247\377\320\333\331\377\210\377\377\377" \
+  "\377\3\264\306\302\377\223\254\247\377\305\320\310\377\325\354\354\341" \
+  "\377\1\231\246\236\377\203Slg\377\2]to\377dzt\377\205Slg\377\1\235\252" \
+  "\242\377\207\354\354\341\377\2\344\345\333\377\210\230\221\377\202Sl" \
+  "g\377\1\202\223\214\377\252\354\354\341\377\4\347\350\336\377\227\257" \
+  "\252\377\223\254\247\377\357\363\362\377\207\377\377\377\377\4\372\373" \
+  "\373\377\231\261\254\377\223\254\247\377\336\342\330\377\262\354\354" \
+  "\341\377\3\322\331\320\377\223\254\247\377\244\271\264\377\210\377\377" \
+  "\377\377\3\342\351\347\377\223\254\247\377\240\265\257\377\325\354\354" \
+  "\341\377\2\336\340\326\377^up\377\210Slg\377\2i\177y\377\344\345\333" \
+  "\377\204\354\354\341\377\4\347\347\335\377\267\277\266\377\230\246\236" \
+  "\377g}w\377\203Slg\377\1\256\270\257\377\252\354\354\341\377\3\305\320" \
+  "\310\377\223\254\247\377\261\303\277\377\210\377\377\377\377\3\323\335" \
+  "\333\377\223\254\247\377\252\275\266\377\263\354\354\341\377\4\353\353" \
+  "\341\377\237\265\257\377\223\254\247\377\342\351\350\377\210\377\377" \
+  "\377\377\3\244\271\264\377\223\254\247\377\323\332\321\377\325\354\354" \
+  "\341\377\2\327\332\320\377l\201{\377\206Slg\377\2\\tn\377\317\324\312" \
+  "\377\205\354\354\341\377\1\325\330\316\377\205Slg\377\2Voi\377\337\341" \
+  "\327\377\252\354\354\341\377\3\240\266\260\377\223\254\247\377\336\346" \
+  "\344\377\210\377\377\377\377\3\245\272\266\377\223\254\247\377\320\330" \
+  "\317\377\264\354\354\341\377\3\304\317\307\377\223\254\247\377\265\306" \
+  "\303\377\210\377\377\377\377\3\320\333\331\377\223\254\247\377\256\277" \
+  "\271\377\326\354\354\341\377\10\344\345\333\377\232\250\240\377w\212" \
+  "\204\377Xqk\377Slg\377axr\377\213\233\224\377\336\340\326\377\206\354" \
+  "\354\341\377\1\325\330\316\377\205Slg\377\1\206\227\220\377\252\354\354" \
+  "\341\377\4\324\332\321\377\223\254\247\377\241\266\262\377\376\376\376" \
+  "\377\207\377\377\377\377\4\344\352\351\377\223\254\247\377\235\263\256" \
+  "\377\353\353\340\377\264\354\354\341\377\4\346\347\335\377\226\256\251" \
+  "\377\224\255\250\377\362\365\365\377\207\377\377\377\377\4\371\372\372" \
+  "\377\230\260\253\377\224\255\247\377\341\344\332\377\330\354\354\341" \
+  "\377\2\352\352\337\377\342\343\331\377\211\354\354\341\377\1\350\351" \
+  "\336\377\205\324\330\316\377\1\342\343\331\377\252\354\354\341\377\3" \
+  "\256\300\271\377\223\254\247\377\315\330\326\377\210\377\377\377\377" \
+  "\3\267\310\304\377\223\254\247\377\301\315\305\377\266\354\354\341\377" \
+  "\3\265\305\275\377\223\254\247\377\306\323\321\377\210\377\377\377\377" \
+  "\3\277\316\313\377\223\254\247\377\274\312\302\377\377\354\354\341\377" \
+  "\224\354\354\341\377\4\341\344\332\377\224\255\247\377\226\257\252\377" \
+  "\367\370\370\377\207\377\377\377\377\4\364\367\366\377\225\255\250\377" \
+  "\225\256\250\377\345\347\334\377\266\354\354\341\377\4\333\337\326\377" \
+  "\223\254\247\377\234\263\256\377\374\375\375\377\207\377\377\377\377" \
+  "\4\354\360\357\377\223\254\247\377\232\261\253\377\351\352\337\377\377" \
+  "\354\354\341\377\223\354\354\341\377\3\275\312\302\377\223\254\247\377" \
+  "\273\313\310\377\210\377\377\377\377\3\310\325\322\377\223\254\247\377" \
+  "\263\303\274\377\270\354\354\341\377\3\247\272\264\377\223\254\247\377" \
+  "\330\341\337\377\210\377\377\377\377\3\255\300\274\377\223\254\247\377" \
+  "\313\324\313\377\377\354\354\341\377\222\354\354\341\377\4\352\352\337" \
+  "\377\232\261\254\377\223\254\247\377\351\356\355\377\207\377\377\377" \
+  "\377\4\375\375\375\377\235\264\257\377\223\254\247\377\330\336\324\377" \
+  "\270\354\354\341\377\3\314\325\314\377\223\254\247\377\252\276\272\377" \
+  "\210\377\377\377\377\3\333\343\342\377\223\254\247\377\245\271\263\377" \
+  "\321\354\354\341\377\1\331\334\322\377\202\202\224\215\377\1\325\331" \
+  "\317\377\274\354\354\341\377\3\313\324\314\377\223\254\247\377\252\276" \
+  "\272\377\210\377\377\377\377\3\332\343\341\377\223\254\247\377\245\271" \
+  "\263\377\271\354\354\341\377\4\352\352\340\377\233\262\254\377\223\254" \
+  "\247\377\351\356\355\377\207\377\377\377\377\4\375\376\376\377\236\264" \
+  "\260\377\223\254\247\377\331\336\325\377\320\354\354\341\377\1\320\324" \
+  "\313\377\202Slg\377\1\312\320\306\377\274\354\354\341\377\3\246\272\263" \
+  "\377\223\254\247\377\327\340\337\377\210\377\377\377\377\3\254\300\274" \
+  "\377\223\254\247\377\312\324\313\377\272\354\354\341\377\3\276\313\303" \
+  "\377\223\254\247\377\274\314\310\377\210\377\377\377\377\3\311\326\323" \
+  "\377\223\254\247\377\264\304\274\377\320\354\354\341\377\1\320\324\313" \
+  "\377\202Slg\377\1\312\320\306\377\273\354\354\341\377\4\332\337\325\377" \
+  "\223\254\247\377\233\263\256\377\374\375\375\377\207\377\377\377\377" \
+  "\4\354\360\357\377\223\254\247\377\231\261\253\377\351\352\337\377\272" \
+  "\354\354\341\377\4\342\345\332\377\224\255\250\377\226\257\252\377\367" \
+  "\371\371\377\207\377\377\377\377\1\364\367\366\377\202\225\256\251\377" \
+  "\1\345\347\334\377\317\354\354\341\377\1\320\324\313\377\202Slg\377\1" \
+  "\312\320\306\377\273\354\354\341\377\3\264\304\275\377\223\254\247\377" \
+  "\306\323\320\377\210\377\377\377\377\3\276\315\312\377\223\254\247\377" \
+  "\273\311\301\377\274\354\354\341\377\3\257\300\271\377\223\254\247\377" \
+  "\315\331\327\377\210\377\377\377\377\3\270\310\305\377\223\254\247\377" \
+  "\302\316\306\377\317\354\354\341\377\1\320\324\313\377\202Slg\377\1p" \
+  "\205~\377\224y\214\205\377\5|\217\210\377\210\231\222\377\226\244\234" \
+  "\377\266\277\266\377\334\336\324\377\241\354\354\341\377\4\345\347\334" \
+  "\377\226\256\251\377\224\255\250\377\362\365\364\377\207\377\377\377" \
+  "\377\4\371\372\372\377\230\260\253\377\224\255\247\377\340\344\331\377" \
+  "\274\354\354\341\377\4\325\333\322\377\223\254\247\377\241\267\262\377" \
+  "\376\376\376\377\207\377\377\377\377\4\345\353\352\377\223\254\247\377" \
+  "\236\264\256\377\353\353\340\377\316\354\354\341\377\1\320\324\313\377" \
+  "\234Slg\377\2\202\224\215\377\320\324\313\377\237\354\354\341\377\3\302" \
+  "\316\306\377\223\254\247\377\264\306\302\377\210\377\377\377\377\3\320" \
+  "\333\330\377\223\254\247\377\255\277\270\377\276\354\354\341\377\3\241" \
+  "\266\260\377\223\254\247\377\337\346\345\377\210\377\377\377\377\3\246" \
+  "\273\267\377\223\254\247\377\320\330\317\377\316\354\354\341\377\1\320" \
+  "\324\313\377\235Slg\377\2Uni\377\250\263\253\377\235\354\354\341\377" \
+  "\4\353\353\341\377\236\264\256\377\223\254\247\377\342\351\347\377\210" \
+  "\377\377\377\377\3\243\270\264\377\223\254\247\377\323\332\320\377\276" \
+  "\354\354\341\377\3\306\321\310\377\223\254\247\377\261\303\300\377\210" \
+  "\377\377\377\377\3\324\336\334\377\223\254\247\377\253\275\267\377\316" \
+  "\354\354\341\377\1\320\324\313\377\237Slg\377\1\240\254\244\377\234\354" \
+  "\354\341\377\3\321\331\317\377\223\254\247\377\243\270\264\377\210\377" \
+  "\377\377\377\3\341\350\347\377\223\254\247\377\237\265\257\377\277\354" \
+  "\354\341\377\4\347\350\336\377\227\257\252\377\223\254\247\377\360\363" \
+  "\363\377\207\377\377\377\377\4\372\373\373\377\232\261\255\377\223\254" \
+  "\247\377\336\342\330\377\315\354\354\341\377\1\341\342\330\377\202\256" \
+  "\270\257\377\2\252\265\254\377d{u\377\202Slg\377\5[sn\377w\212\204\377" \
+  "\210\231\222\377\232\250\240\377\253\265\255\377\202\256\270\257\377" \
+  "\4\245\260\250\377\223\242\232\377\201\223\214\377o\203}\377\203Slg\377" \
+  "\1\210\230\221\377\202\256\270\257\377\5\251\264\253\377\227\245\236" \
+  "\377\206\227\220\377u\210\202\377Xqk\377\203Slg\377\2Tmh\377\304\313" \
+  "\301\377\233\354\354\341\377\3\253\276\267\377\223\254\247\377\320\333" \
+  "\331\377\210\377\377\377\377\3\264\305\302\377\223\254\247\377\304\317" \
+  "\307\377\300\354\354\341\377\3\270\306\277\377\223\254\247\377\303\321" \
+  "\316\377\210\377\377\377\377\3\302\320\316\377\223\254\247\377\271\310" \
+  "\300\377\317\354\354\341\377\6\326\331\317\377p\205~\377Slg\377g}w\377" \
+  "\251\264\254\377\345\346\333\377\212\354\354\341\377\6\322\326\314\377" \
+  "\216\235\226\377Wpj\377Tmh\377\234\251\241\377\353\353\340\377\204\354" \
+  "\354\341\377\3\336\340\326\377\231\246\236\377Zrl\377\202Slg\377\1s\207" \
+  "\201\377\232\354\354\341\377\4\337\343\331\377\223\254\247\377\230\260" \
+  "\253\377\371\372\372\377\207\377\377\377\377\4\362\365\364\377\224\255" \
+  "\250\377\227\257\251\377\346\350\335\377\300\354\354\341\377\4\335\341" \
+  "\327\377\223\254\247\377\232\262\255\377\373\374\374\377\207\377\377" \
+  "\377\377\4\357\363\362\377\223\254\247\377\230\260\252\377\350\351\336" \
+  "\377\315\354\354\341\377\5\341\343\330\377g}w\377Slg\377\204\225\216" \
+  "\377\352\352\340\377\216\354\354\341\377\4\323\327\315\377]to\377Slg" \
+  "\377\234\251\241\377\206\354\354\341\377\2\331\334\322\377]uo\377\202" \
+  "Slg\377\1\311\316\305\377\231\354\354\341\377\3\272\310\300\377\223\254" \
+  "\247\377\277\316\313\377\210\377\377\377\377\3\305\323\320\377\223\254" \
+  "\247\377\266\305\276\377\302\354\354\341\377\3\251\274\266\377\223\254" \
+  "\247\377\325\336\334\377\210\377\377\377\377\3\261\303\300\377\223\254" \
+  "\247\377\310\322\312\377\315\354\354\341\377\4\204\225\216\377Slg\377" \
+  "s\207\201\377\347\347\335\377\220\354\354\341\377\4\303\312\300\377U" \
+  "ni\377Slg\377\301\310\277\377\206\354\354\341\377\1\272\302\271\377\202" \
+  "Slg\377\1\235\252\242\377\230\354\354\341\377\4\350\351\336\377\230\260" \
+  "\252\377\223\254\247\377\354\360\357\377\207\377\377\377\377\4\374\375" \
+  "\375\377\233\263\256\377\223\254\247\377\333\340\326\377\302\354\354" \
+  "\341\377\3\317\327\316\377\223\254\247\377\247\274\270\377\210\377\377" \
+  "\377\377\3\336\346\344\377\223\254\247\377\243\267\261\377\314\354\354" \
+  "\341\377\4\330\333\321\377Tmg\377Slg\377\310\316\304\377\222\354\354" \
+  "\341\377\3\206\227\220\377Slg\377\177\221\212\377\207\354\354\341\377" \
+  "\3z\215\206\377Slg\377x\213\205\377\230\354\354\341\377\3\310\322\312" \
+  "\377\223\254\247\377\255\300\274\377\210\377\377\377\377\3\327\340\337" \
+  "\377\223\254\247\377\247\273\264\377\303\354\354\341\377\4\353\353\340" \
+  "\377\234\263\255\377\223\254\247\377\346\354\353\377\207\377\377\377" \
+  "\377\4\376\376\376\377\241\266\262\377\223\254\247\377\326\334\323\377" \
+  "\313\354\354\341\377\4\241\255\245\377Slg\377Unh\377\345\346\334\377" \
+  "\222\354\354\341\377\4\245\261\251\377Slg\377Unh\377\341\342\330\377" \
+  "\206\354\354\341\377\3\230\246\236\377Slg\377f|v\377\230\354\354\341" \
+  "\377\3\243\270\261\377\223\254\247\377\333\343\342\377\210\377\377\377" \
+  "\377\3\251\275\271\377\223\254\247\377\315\326\315\377\304\354\354\341" \
+  "\377\3\300\314\304\377\223\254\247\377\271\311\306\377\210\377\377\377" \
+  "\377\3\315\331\326\377\223\254\247\377\261\302\273\377\313\354\354\341" \
+  "\377\3\207\230\221\377Slg\377m\202|\377\223\354\354\341\377\1\304\312" \
+  "\301\377\202Slg\377\1\312\317\306\377\206\354\354\341\377\3\262\273\263" \
+  "\377Slg\377Zrm\377\227\354\354\341\377\4\327\335\323\377\223\254\247" \
+  "\377\236\264\260\377\375\376\376\377\207\377\377\377\377\4\351\356\355" \
+  "\377\223\254\247\377\233\262\254\377\352\352\340\377\304\354\354\341" \
+  "\377\4\344\346\334\377\225\255\250\377\226\256\251\377\365\370\367\377" \
+  "\207\377\377\377\377\4\367\371\370\377\226\257\252\377\224\255\250\377" \
+  "\343\345\333\377\312\354\354\341\377\3v\212\203\377Slg\377o\203}\377" \
+  "\223\354\354\341\377\1\306\314\303\377\202Slg\377\1\270\301\270\377\206" \
+  "\354\354\341\377\3\306\314\302\377Slg\377Uni\377\227\354\354\341\377" \
+  "\3\261\302\273\377\223\254\247\377\311\326\323\377\210\377\377\377\377" \
+  "\3\273\313\310\377\223\254\247\377\276\313\303\377\306\354\354\341\377" \
+  "\6\262\302\273\377\223\254\247\377\261\304\277\377\336\345\344\377\355" \
+  "\361\360\377\374\374\374\377\205\377\377\377\377\3\274\313\310\377\223" \
+  "\254\247\377\277\314\304\377\312\354\354\341\377\4q\205\177\377Slg\377" \
+  "[sm\377\350\351\336\377\222\354\354\341\377\1\256\270\260\377\202Slg" \
+  "\377\1\264\275\264\377\206\354\354\341\377\3\272\302\271\377Slg\377]" \
+  "uo\377\226\354\354\341\377\4\343\346\333\377\225\255\250\377\225\256" \
+  "\251\377\364\367\366\377\207\377\377\377\377\4\367\371\370\377\226\257" \
+  "\252\377\224\255\250\377\343\345\333\377\306\354\354\341\377\4\327\335" \
+  "\323\377\223\254\247\377\224\255\250\377\231\261\254\377\202\223\254" \
+  "\247\377\11\237\265\261\377\257\301\275\377\276\315\312\377\315\331\326" \
+  "\377\334\344\343\377\332\342\340\377\223\254\247\377\234\262\255\377" \
+  "\352\353\340\377\311\354\354\341\377\1\201\222\213\377\202Slg\377\1\272" \
+  "\302\271\377\222\354\354\341\377\1x\213\204\377\202Slg\377\1\303\311" \
+  "\300\377\206\354\354\341\377\3\250\263\253\377Slg\377g}w\377\226\354" \
+  "\354\341\377\3\300\314\304\377\223\254\247\377\270\310\305\377\210\377" \
+  "\377\377\377\3\315\331\326\377\223\254\247\377\260\301\272\377\310\354" \
+  "\354\341\377\12\234\263\255\377\223\254\247\377\333\343\341\377\367\370" \
+  "\370\377\350\355\354\377\330\341\340\377\311\326\323\377\272\312\307" \
+  "\377\253\277\273\377\234\263\256\377\203\223\254\247\377\1\314\325\314" \
+  "\377\311\354\354\341\377\1\232\247\237\377\202Slg\377\2e{u\377\342\343" \
+  "\331\377\220\354\354\341\377\1\256\270\260\377\202Slg\377\2Tmg\377\333" \
+  "\336\324\377\206\354\354\341\377\3|\216\210\377Slg\377{\216\207\377\225" \
+  "\354\354\341\377\4\353\353\340\377\234\263\255\377\223\254\247\377\345" \
+  "\353\352\377\207\377\377\377\377\4\376\376\376\377\241\266\262\377\223" \
+  "\254\247\377\325\334\322\377\310\354\354\341\377\3\306\320\310\377\223" \
+  "\254\247\377\246\273\266\377\207\377\377\377\377\7\371\372\372\377\312" \
+  "\326\324\377\223\254\247\377\241\266\260\377\354\354\341\377\341\344" \
+  "\331\377\334\340\326\377\306\354\354\341\377\1\315\322\311\377\203Sl" \
+  "g\377\2j\177y\377\317\324\312\377\215\354\354\341\377\3\352\352\337\377" \
+  "\243\257\247\377Tmh\377\202Slg\377\1v\211\203\377\206\354\354\341\377" \
+  "\1\320\324\313\377\202Slg\377\1\221\240\231\377\225\354\354\341\377\3" \
+  "\316\327\316\377\223\254\247\377\246\273\267\377\210\377\377\377\377" \
+  "\3\336\346\344\377\223\254\247\377\242\267\261\377\311\354\354\341\377" \
+  "\4\351\351\337\377\225\255\250\377\223\254\247\377\355\361\361\377\207" \
+  "\377\377\377\377\6\374\375\375\377\227\257\252\377\223\254\247\377\306" \
+  "\321\310\377\223\254\247\377\251\274\266\377\307\354\354\341\377\1x\213" \
+  "\204\377\203Slg\377\4Tmg\377\205\226\217\377\272\302\271\377\342\344" \
+  "\331\377\207\354\354\341\377\4\353\353\341\377\322\326\314\377\245\261" \
+  "\251\377g}w\377\204Slg\377\1\272\302\271\377\205\354\354\341\377\2\315" \
+  "\322\311\377axr\377\202Slg\377\1\264\275\264\377\225\354\354\341\377" \
+  "\3\251\274\265\377\223\254\247\377\324\336\334\377\210\377\377\377\377" \
+  "\3\261\303\300\377\223\254\247\377\307\321\311\377\312\354\354\341\377" \
+  "\3\264\303\274\377\223\254\247\377\271\311\307\377\210\377\377\377\377" \
+  "\6\276\315\312\377\223\254\247\377\255\277\270\377\230\260\252\377\223" \
+  "\254\247\377\334\341\327\377\306\354\354\341\377\2\324\330\316\377Wp" \
+  "j\377\206Slg\377\10cys\377x\213\204\377\177\221\212\377\205\226\217\377" \
+  "\203\224\215\377}\217\210\377o\204}\377Yql\377\206Slg\377\1\201\223\214" \
+  "\377\204\354\354\341\377\3\276\305\274\377\200\222\213\377Voi\377\203" \
+  "Slg\377\1\332\335\323\377\224\354\354\341\377\4\335\341\327\377\223\254" \
+  "\247\377\232\261\255\377\373\374\374\377\207\377\377\377\377\4\357\363" \
+  "\362\377\223\254\247\377\230\257\252\377\347\351\336\377\312\354\354" \
+  "\341\377\4\337\343\331\377\223\254\247\377\225\255\251\377\371\373\373" \
+  "\377\207\377\377\377\377\6\362\365\365\377\223\254\247\377\225\255\250" \
+  "\377\270\306\277\377\223\254\247\377\267\306\277\377\307\354\354\341" \
+  "\377\2\277\306\275\377Wpj\377\222Slg\377\2u\211\202\377\344\345\332\377" \
+  "\204\354\354\341\377\1y\214\206\377\204Slg\377\1s\207\200\377\225\354" \
+  "\354\341\377\3\267\306\277\377\223\254\247\377\302\320\316\377\210\377" \
+  "\377\377\377\3\302\320\316\377\223\254\247\377\271\307\300\377\314\354" \
+  "\354\341\377\3\244\270\261\377\223\254\247\377\317\332\330\377\204\377" \
+  "\377\377\377\1\370\371\371\377\203\377\377\377\377\6\252\276\271\377" \
+  "\223\254\247\377\272\310\302\377\223\254\247\377\227\257\252\377\347" \
+  "\350\336\377\307\354\354\341\377\2\304\313\301\377czt\377\220Slg\377" \
+  "\2\205\226\217\377\344\345\333\377\205\354\354\341\377\1\210\230\221" \
+  "\377\204f|v\377\1\261\272\262\377\224\354\354\341\377\4\347\350\336\377" \
+  "\227\257\252\377\223\254\247\377\357\363\362\377\207\377\377\377\377" \
+  "\4\373\374\374\377\232\261\255\377\223\254\247\377\336\342\330\377\314" \
+  "\354\354\341\377\3\320\331\317\377\223\254\247\377\235\263\257\377\203" \
+  "\377\377\377\377\3\324\336\334\377\227\257\252\377\367\370\370\377\202" \
+  "\377\377\377\377\6\341\350\346\377\223\254\247\377\232\262\254\377\253" \
+  "\275\267\377\223\254\247\377\305\320\310\377\310\354\354\341\377\3\343" \
+  "\344\332\377\224\242\233\377Yql\377\214Slg\377\2l\201{\377\273\303\272" \
+  "\377\241\354\354\341\377\3\306\320\310\377\223\254\247\377\261\303\300" \
+  "\377\210\377\377\377\377\3\324\336\334\377\223\254\247\377\252\275\266" \
+  "\377\315\354\354\341\377\4\353\353\341\377\230\260\252\377\223\254\247" \
+  "\377\343\352\350\377\202\377\377\377\377\3\357\363\362\377\223\254\247" \
+  "\377\315\330\326\377\203\377\377\377\377\5\234\262\256\377\223\254\247" \
+  "\377\240\265\257\377\223\254\247\377\241\266\257\377\312\354\354\341" \
+  "\377\4\343\344\332\377\255\267\257\377\204\225\216\377bys\377\205Slg" \
+  "\377\4Uni\377r\206\177\377\223\242\232\377\306\314\303\377\243\354\354" \
+  "\341\377\3\241\266\260\377\223\254\247\377\336\346\344\377\210\377\377" \
+  "\377\377\3\247\273\267\377\223\254\247\377\320\330\317\377\316\354\354" \
+  "\341\377\3\276\313\303\377\223\254\247\377\255\300\274\377\203\377\377" \
+  "\377\377\3\261\303\300\377\241\266\262\377\376\376\376\377\202\377\377" \
+  "\377\377\1\313\327\324\377\202\223\254\247\377\3\226\256\251\377\223" \
+  "\254\247\377\324\333\321\377\315\354\354\341\377\6\344\345\333\377\333" \
+  "\336\324\377\322\326\314\377\326\331\317\377\337\341\326\377\351\351" \
+  "\337\377\245\354\354\341\377\4\324\333\322\377\223\254\247\377\241\266" \
+  "\262\377\376\376\376\377\207\377\377\377\377\4\346\353\352\377\223\254" \
+  "\247\377\235\263\256\377\353\353\340\377\316\354\354\341\377\4\345\347" \
+  "\335\377\224\254\250\377\223\254\247\377\363\366\365\377\202\377\377" \
+  "\377\377\3\337\346\345\377\223\254\247\377\336\346\344\377\202\377\377" \
+  "\377\377\6\371\372\372\377\225\255\250\377\224\254\247\377\275\312\302" \
+  "\377\223\254\247\377\256\300\271\377\370\354\354\341\377\3\257\300\271" \
+  "\377\223\254\247\377\315\331\326\377\210\377\377\377\377\3\270\311\305" \
+  "\377\223\254\247\377\301\315\305\377\320\354\354\341\377\3\254\276\270" \
+  "\377\223\254\247\377\301\320\314\377\202\377\377\377\377\3\376\376\376" \
+  "\377\241\266\262\377\261\303\300\377\203\377\377\377\377\6\265\306\303" \
+  "\377\223\254\247\377\266\303\274\377\225\256\251\377\224\255\250\377" \
+  "\341\344\332\377\366\354\354\341\377\4\342\344\332\377\224\255\250\377" \
+  "\226\257\252\377\367\371\370\377\207\377\377\377\377\4\365\367\367\377" \
+  "\225\256\251\377\225\256\250\377\344\346\334\377\320\354\354\341\377" \
+  "\4\332\337\325\377\223\254\247\377\227\257\253\377\374\375\375\377\202" \
+  "\377\377\377\377\3\315\331\326\377\223\254\247\377\360\363\363\377\202" \
+  "\377\377\377\377\6\354\361\360\377\223\254\247\377\226\256\251\377\263" \
+  "\303\274\377\223\254\247\377\275\312\302\377\330\354\354\341\377\3\333" \
+  "\335\323\377\317\324\312\377\326\332\320\377\233\354\354\341\377\3\275" \
+  "\312\303\377\223\254\247\377\274\313\310\377\210\377\377\377\377\3\312" \
+  "\326\324\377\223\254\247\377\263\303\274\377\322\354\354\341\377\3\237" \
+  "\265\257\377\223\254\247\377\327\341\337\377\202\377\377\377\377\3\367" \
+  "\371\370\377\226\257\252\377\303\321\316\377\203\377\377\377\377\6\243" \
+  "\271\264\377\223\254\247\377\276\313\304\377\223\254\247\377\232\262" \
+  "\254\377\352\353\340\377\327\354\354\341\377\3\215\234\225\377Slg\377" \
+  "y\214\205\377\232\354\354\341\377\4\352\352\337\377\232\261\254\377\223" \
+  "\254\247\377\351\356\355\377\207\377\377\377\377\4\375\376\376\377\236" \
+  "\265\260\377\223\254\247\377\330\336\324\377\322\354\354\341\377\3\311" \
+  "\323\313\377\223\254\247\377\242\270\264\377\203\377\377\377\377\3\274" \
+  "\313\310\377\232\262\255\377\373\374\374\377\202\377\377\377\377\6\330" \
+  "\341\340\377\223\254\247\377\236\264\256\377\270\307\300\377\315\326" \
+  "\315\377\352\353\340\377\327\354\354\341\377\3\215\234\225\377Slg\377" \
+  "y\214\205\377\232\354\354\341\377\3\314\325\314\377\223\254\247\377\252" \
+  "\276\272\377\210\377\377\377\377\3\333\344\342\377\223\254\247\377\244" \
+  "\271\262\377\323\354\354\341\377\4\352\352\337\377\226\256\252\377\223" \
+  "\254\247\377\352\357\356\377\202\377\377\377\377\3\351\356\355\377\223" \
+  "\254\247\377\325\337\335\377\202\377\377\377\377\4\375\376\376\377\230" \
+  "\257\253\377\223\254\247\377\332\337\325\377\331\354\354\341\377\3\215" \
+  "\234\225\377Slg\377y\214\205\377\232\354\354\341\377\3\246\272\264\377" \
+  "\223\254\247\377\330\341\337\377\210\377\377\377\377\3\256\301\275\377" \
+  "\223\254\247\377\312\323\313\377\324\354\354\341\377\3\270\306\276\377" \
+  "\223\254\247\377\264\305\301\377\203\377\377\377\377\2\252\276\272\377" \
+  "\250\274\270\377\203\377\377\377\377\3\302\321\316\377\223\254\247\377" \
+  "\256\300\271\377\310\354\354\341\377\5\343\344\332\377\310\316\304\377" \
+  "\262\273\263\377\250\263\253\377\241\255\245\377\214\237\254\244\377" \
+  "\3p\204~\377Slg\377y\214\205\377\231\354\354\341\377\4\332\337\325\377" \
+  "\223\254\247\377\234\263\256\377\374\375\375\377\207\377\377\377\377" \
+  "\4\355\361\360\377\223\254\247\377\231\261\253\377\351\352\337\377\324" \
+  "\354\354\341\377\4\341\344\332\377\223\254\247\377\224\255\250\377\370" \
+  "\371\371\377\202\377\377\377\377\3\330\341\337\377\223\254\247\377\347" \
+  "\355\354\377\202\377\377\377\377\4\365\367\367\377\224\255\247\377\224" \
+  "\255\250\377\345\347\334\377\305\354\354\341\377\3\300\307\276\377~\220" \
+  "\211\377Unh\377\222Slg\377\1y\214\205\377\231\354\354\341\377\3\265\304" \
+  "\275\377\223\254\247\377\306\323\320\377\210\377\377\377\377\3\300\317" \
+  "\314\377\223\254\247\377\273\311\301\377\326\354\354\341\377\3\247\272" \
+  "\263\377\223\254\247\377\311\326\323\377\202\377\377\377\377\11\374\375" \
+  "\375\377\234\263\256\377\272\312\307\377\377\377\377\377\373\374\374" \
+  "\377\325\336\334\377\230\260\253\377\223\254\247\377\302\316\306\377" \
+  "\303\354\354\341\377\2\353\353\340\377\215\234\225\377\225Slg\377\1y" \
+  "\214\205\377\230\354\354\341\377\4\345\347\335\377\226\256\251\377\224" \
+  "\255\250\377\362\365\365\377\207\377\377\377\377\4\371\372\372\377\230" \
+  "\260\253\377\224\255\247\377\340\343\331\377\326\354\354\341\377\3\324" \
+  "\332\321\377\223\254\247\377\232\261\255\377\203\377\377\377\377\11\306" \
+  "\323\321\377\226\256\251\377\300\317\314\377\232\262\255\377\231\261" \
+  "\254\377\267\307\304\377\223\254\247\377\236\264\256\377\353\353\341" \
+  "\377\302\354\354\341\377\1\227\245\235\377\226Slg\377\1y\214\205\377" \
+  "\230\354\354\341\377\3\303\316\306\377\223\254\247\377\264\306\302\377" \
+  "\210\377\377\377\377\3\321\334\332\377\223\254\247\377\255\277\270\377" \
+  "\330\354\354\341\377\16\232\262\254\377\223\254\247\377\337\346\345\377" \
+  "\377\377\377\377\341\350\347\377\260\302\277\377\224\254\247\377\245" \
+  "\271\266\377\324\336\334\377\372\373\373\377\377\377\377\377\246\273" \
+  "\267\377\223\254\247\377\321\330\317\377\301\354\354\341\377\2\326\331" \
+  "\317\377Uni\377\205Slg\377\4`wr\377l\201{\377x\213\204\377\204\225\216" \
+  "\377\213\207\230\221\377\3g}w\377Slg\377y\214\205\377\227\354\354\341" \
+  "\377\4\353\353\341\377\237\264\257\377\223\254\247\377\342\351\350\377" \
+  "\210\377\377\377\377\3\244\271\265\377\223\254\247\377\322\331\320\377" \
+  "\330\354\354\341\377\7\302\315\306\377\223\254\247\377\237\265\261\377" \
+  "\244\271\264\377\225\256\251\377\270\311\305\377\346\353\352\377\204" \
+  "\377\377\377\377\3\324\336\334\377\223\254\247\377\253\276\267\377\301" \
+  "\354\354\341\377\1\244\260\250\377\203Slg\377\3^vp\377\236\253\243\377" \
+  "\324\330\316\377\217\354\354\341\377\3\215\234\225\377Slg\377y\214\205" \
+  "\377\227\354\354\341\377\3\321\331\320\377\223\254\247\377\244\271\264" \
+  "\377\210\377\377\377\377\3\343\352\350\377\223\254\247\377\237\265\257" \
+  "\377\331\354\354\341\377\5\347\350\336\377\225\255\250\377\223\254\247" \
+  "\377\303\320\316\377\365\367\367\377\206\377\377\377\377\4\373\374\374" \
+  "\377\232\261\254\377\223\254\247\377\337\342\330\377\300\354\354\341" \
+  "\377\1\202\224\215\377\202Slg\377\2Woj\377\311\316\305\377\221\354\354" \
+  "\341\377\3\215\234\225\377Slg\377y\214\205\377\227\354\354\341\377\3" \
+  "\254\276\267\377\223\254\247\377\320\333\331\377\210\377\377\377\377" \
+  "\3\265\306\303\377\223\254\247\377\304\317\307\377\332\354\354\341\377" \
+  "\3\267\306\276\377\223\254\247\377\304\322\317\377\210\377\377\377\377" \
+  "\3\302\320\316\377\223\254\247\377\272\310\300\377\300\354\354\341\377" \
+  "\1u\210\202\377\202Slg\377\1\224\243\233\377\222\354\354\341\377\3\215" \
+  "\234\225\377Slg\377y\214\205\377\226\354\354\341\377\4\337\343\331\377" \
+  "\223\254\247\377\230\260\253\377\371\372\372\377\207\377\377\377\377" \
+  "\4\363\366\365\377\224\255\250\377\226\256\251\377\346\350\335\377\332" \
+  "\354\354\341\377\4\334\340\327\377\223\254\247\377\233\262\255\377\373" \
+  "\374\374\377\207\377\377\377\377\4\357\363\362\377\223\254\247\377\230" \
+  "\260\252\377\350\351\336\377\277\354\354\341\377\1r\206\177\377\202S" \
+  "lg\377\1\262\274\263\377\222\354\354\341\377\3\325\330\316\377\306\314" \
+  "\302\377\317\324\312\377\226\354\354\341\377\3\272\310\301\377\223\254" \
+  "\247\377\277\316\313\377\210\377\377\377\377\3\307\324\321\377\223\254" \
+  "\247\377\266\305\276\377\334\354\354\341\377\3\250\273\265\377\223\254" \
+  "\247\377\325\337\335\377\210\377\377\377\377\3\261\303\300\377\223\254" \
+  "\247\377\310\322\312\377\277\354\354\341\377\1\206\227\220\377\202Sl" \
+  "g\377\1\310\316\304\377\252\354\354\341\377\4\351\351\337\377\231\260" \
+  "\253\377\223\254\247\377\354\361\360\377\207\377\377\377\377\4\374\375" \
+  "\375\377\234\263\257\377\223\254\247\377\333\340\326\377\334\354\354" \
+  "\341\377\3\316\326\315\377\223\254\247\377\250\274\270\377\210\377\377" \
+  "\377\377\3\336\346\344\377\223\254\247\377\243\270\261\377\277\354\354" \
+  "\341\377\1\242\256\246\377\202Slg\377\1\261\272\262\377\252\354\354\341" \
+  "\377\3\311\323\312\377\223\254\247\377\256\301\275\377\210\377\377\377" \
+  "\377\3\330\341\340\377\223\254\247\377\247\272\264\377\335\354\354\341" \
+  "\377\4\352\353\340\377\234\262\255\377\223\254\247\377\347\355\354\377" \
+  "\207\377\377\377\377\4\376\376\376\377\241\266\262\377\223\254\247\377" \
+  "\327\335\323\377\276\354\354\341\377\4\336\340\326\377Xpk\377Slg\377" \
+  "\221\240\230\377\222\354\354\341\377\3\336\340\326\377\324\330\316\377" \
+  "\332\335\323\377\225\354\354\341\377\3\243\270\262\377\223\254\247\377" \
+  "\333\343\342\377\210\377\377\377\377\3\253\277\273\377\223\254\247\377" \
+  "\315\325\315\377\336\354\354\341\377\3\277\314\304\377\223\254\247\377" \
+  "\272\312\306\377\210\377\377\377\377\3\315\331\326\377\223\254\247\377" \
+  "\261\302\273\377\277\354\354\341\377\4\232\250\240\377Slg\377^up\377" \
+  "\330\333\321\377\221\354\354\341\377\3\215\234\225\377Slg\377y\214\205" \
+  "\377\224\354\354\341\377\4\327\335\324\377\223\254\247\377\236\264\260" \
+  "\377\375\376\376\377\207\377\377\377\377\4\352\357\356\377\223\254\247" \
+  "\377\233\262\254\377\352\352\340\377\336\354\354\341\377\4\343\345\333" \
+  "\377\224\255\250\377\226\256\251\377\366\370\367\377\207\377\377\377" \
+  "\377\4\367\371\370\377\226\257\252\377\225\255\250\377\343\346\333\377" \
+  "\276\354\354\341\377\5\353\353\340\377\207\230\221\377Slg\377l\201{\377" \
+  "\344\345\332\377\220\354\354\341\377\3\215\234\225\377Slg\377y\214\205" \
+  "\377\224\354\354\341\377\3\262\302\273\377\223\254\247\377\312\326\324" \
+  "\377\210\377\377\377\377\3\275\314\311\377\223\254\247\377\276\313\303" \
+  "\377\340\354\354\341\377\3\261\301\272\377\223\254\247\377\313\327\325" \
+  "\377\210\377\377\377\377\3\274\313\310\377\223\254\247\377\300\314\304" \
+  "\377\277\354\354\341\377\6\351\351\337\377\237\254\244\377Wpj\377axr" \
+  "\377\237\254\244\377\336\340\326\377\216\354\354\341\377\3\215\234\225" \
+  "\377Slg\377y\214\205\377\223\354\354\341\377\4\344\346\334\377\225\255" \
+  "\250\377\225\256\251\377\365\367\367\377\207\377\377\377\377\4\370\371" \
+  "\371\377\227\257\252\377\224\255\250\377\342\345\333\377\340\354\354" \
+  "\341\377\4\326\334\323\377\223\254\247\377\237\265\261\377\376\376\376" \
+  "\377\207\377\377\377\377\4\351\356\355\377\223\254\247\377\234\263\255" \
+  "\377\353\353\340\377\274\354\354\341\377\1\335\337\325\377\203\232\250" \
+  "\240\377\1\204\225\216\377\202Slg\377\5Voi\377k\200z\377|\216\210\377" \
+  "\214\234\224\377\231\247\237\377\212\232\250\240\377\3n\203}\377Slg\377" \
+  "y\214\205\377\223\354\354\341\377\3\300\315\305\377\223\254\247\377\270" \
+  "\311\305\377\210\377\377\377\377\3\316\332\327\377\223\254\247\377\260" \
+  "\301\272\377\342\354\354\341\377\3\242\267\261\377\223\254\247\377\335" \
+  "\345\343\377\210\377\377\377\377\3\252\276\272\377\223\254\247\377\316" \
+  "\327\316\377\274\354\354\341\377\1\320\324\313\377\227Slg\377\1y\214" \
+  "\205\377\222\354\354\341\377\4\353\353\340\377\234\263\255\377\223\254" \
+  "\247\377\346\353\352\377\210\377\377\377\377\3\242\267\263\377\223\254" \
+  "\247\377\325\333\322\377\342\354\354\341\377\3\310\322\311\377\223\254" \
+  "\247\377\257\302\276\377\210\377\377\377\377\3\330\341\337\377\223\254" \
+  "\247\377\251\274\265\377\274\354\354\341\377\1\320\324\313\377\227Sl" \
+  "g\377\1y\214\205\377\222\354\354\341\377\3\317\327\316\377\223\254\247" \
+  "\377\247\273\267\377\210\377\377\377\377\3\340\347\346\377\223\254\247" \
+  "\377\241\266\260\377\343\354\354\341\377\4\350\351\336\377\230\260\252" \
+  "\377\223\254\247\377\356\362\361\377\207\377\377\377\377\4\374\375\375" \
+  "\377\234\263\256\377\223\254\247\377\335\341\327\377\273\354\354\341" \
+  "\377\1\320\324\313\377\227Slg\377\1y\214\205\377\222\354\354\341\377" \
+  "\3\251\274\266\377\223\254\247\377\324\336\334\377\210\377\377\377\377" \
+  "\3\263\304\301\377\223\254\247\377\307\321\311\377\344\354\354\341\377" \
+  "\3\271\310\300\377\223\254\247\377\301\317\314\377\210\377\377\377\377" \
+  "\3\306\323\321\377\223\254\247\377\267\306\277\377\273\354\354\341\377" \
+  "\1\320\324\313\377\202Slg\377\1\177\221\212\377\222\214\234\224\377\3" \
+  "i~x\377Slg\377y\214\205\377\221\354\354\341\377\4\335\341\327\377\223" \
+  "\254\247\377\232\261\254\377\373\374\374\377\207\377\377\377\377\4\361" \
+  "\364\363\377\224\255\250\377\230\257\252\377\347\351\336\377\344\354" \
+  "\354\341\377\4\336\342\330\377\223\254\247\377\231\261\254\377\372\373" \
+  "\373\377\207\377\377\377\377\4\362\365\365\377\224\255\250\377\227\257" \
+  "\252\377\347\350\336\377\272\354\354\341\377\1\320\324\313\377\202Sl" \
+  "g\377\1\312\320\306\377\222\354\354\341\377\3\215\234\225\377Slg\377" \
+  "y\214\205\377\221\354\354\341\377\3\270\306\277\377\223\254\247\377\303" \
+  "\321\316\377\210\377\377\377\377\3\304\322\317\377\223\254\247\377\270" \
+  "\307\277\377\346\354\354\341\377\3\253\275\266\377\223\254\247\377\323" \
+  "\335\333\377\210\377\377\377\377\3\265\306\303\377\223\254\247\377\306" \
+  "\320\310\377\272\354\354\341\377\1\320\324\313\377\202Slg\377\1\312\320" \
+  "\306\377\222\354\354\341\377\3\215\234\225\377Slg\377y\214\205\377\220" \
+  "\354\354\341\377\4\347\350\336\377\227\257\252\377\223\254\247\377\357" \
+  "\363\362\377\207\377\377\377\377\4\373\374\374\377\233\262\255\377\223" \
+  "\254\247\377\335\341\327\377\346\354\354\341\377\3\320\330\317\377\223" \
+  "\254\247\377\245\272\266\377\210\377\377\377\377\3\342\351\350\377\223" \
+  "\254\247\377\241\266\260\377\272\354\354\341\377\1\320\324\313\377\202" \
+  "Slg\377\1\312\320\306\377\222\354\354\341\377\3\215\234\225\377Slg\377" \
+  "y\214\205\377\220\354\354\341\377\3\306\321\310\377\223\254\247\377\261" \
+  "\303\300\377\210\377\377\377\377\3\326\337\336\377\223\254\247\377\252" \
+  "\274\266\377\347\354\354\341\377\4\353\353\340\377\235\264\256\377\223" \
+  "\254\247\377\344\352\351\377\210\377\377\377\377\3\244\271\264\377\223" \
+  "\254\247\377\324\333\321\377\271\354\354\341\377\1\333\336\324\377\202" \
+  "\221\240\230\377\1\330\333\321\377\222\354\354\341\377\3\314\321\307" \
+  "\377\267\300\267\377\304\313\301\377\220\354\354\341\377\3\241\266\260" \
+  "\377\223\254\247\377\337\346\345\377\210\377\377\377\377\3\250\274\270" \
+  "\377\223\254\247\377\317\327\316\377\350\354\354\341\377\3\302\316\305" \
+  "\377\223\254\247\377\267\307\304\377\210\377\377\377\377\3\321\334\331" \
+  "\377\223\254\247\377\257\300\271\377\341\354\354\341\377\4\325\333\322" \
+  "\377\223\254\247\377\241\267\262\377\376\376\376\377\207\377\377\377" \
+  "\377\4\347\355\354\377\223\254\247\377\235\263\255\377\353\353\340\377" \
+  "\350\354\354\341\377\4\345\347\334\377\225\256\251\377\225\255\250\377" \
+  "\364\366\366\377\207\377\377\377\377\4\371\372\372\377\230\260\253\377" \
+  "\224\255\250\377\342\344\332\377\340\354\354\341\377\3\257\300\271\377" \
+  "\223\254\247\377\315\331\327\377\210\377\377\377\377\3\272\312\307\377" \
+  "\223\254\247\377\301\315\305\377\352\354\354\341\377\3\263\303\274\377" \
+  "\223\254\247\377\310\325\322\377\210\377\377\377\377\3\277\316\313\377" \
+  "\223\254\247\377\275\312\302\377\337\354\354\341\377\4\342\345\332\377" \
+  "\224\255\250\377\226\257\252\377\367\371\370\377\207\377\377\377\377" \
+  "\4\366\370\370\377\226\256\251\377\225\256\250\377\344\346\334\377\352" \
+  "\354\354\341\377\4\331\336\324\377\223\254\247\377\235\264\257\377\375" \
+  "\375\375\377\207\377\377\377\377\4\354\361\360\377\223\254\247\377\232" \
+  "\261\254\377\352\352\337\377\314\354\354\341\377\1\303\312\300\377\202" \
+  "t\210\201\377\1\350\351\336\377\216\354\354\341\377\3\276\313\303\377" \
+  "\223\254\247\377\274\313\310\377\210\377\377\377\377\3\313\327\325\377" \
+  "\223\254\247\377\262\303\273\377\354\354\354\341\377\3\245\271\263\377" \
+  "\223\254\247\377\332\342\341\377\210\377\377\377\377\3\256\301\275\377" \
+  "\223\254\247\377\314\325\314\377\314\354\354\341\377\1\267\300\267\377" \
+  "\202Slg\377\1\347\350\335\377\215\354\354\341\377\4\352\352\337\377\232" \
+  "\261\254\377\223\254\247\377\351\356\355\377\207\377\377\377\377\4\376" \
+  "\376\376\377\240\266\261\377\223\254\247\377\330\335\324\377\354\354" \
+  "\354\341\377\3\312\324\313\377\223\254\247\377\254\277\273\377\210\377" \
+  "\377\377\377\3\333\343\342\377\223\254\247\377\246\272\263\377\314\354" \
+  "\354\341\377\1\267\300\267\377\202Slg\377\1\347\350\335\377\215\354\354" \
+  "\341\377\3\314\325\314\377\223\254\247\377\252\276\272\377\210\377\377" \
+  "\377\377\3\335\345\343\377\223\254\247\377\244\270\262\377\355\354\354" \
+  "\341\377\4\351\352\337\377\232\261\253\377\223\254\247\377\353\360\357" \
+  "\377\207\377\377\377\377\4\375\376\376\377\236\264\260\377\223\254\247" \
+  "\377\332\337\325\377\312\354\354\341\377\2\343\344\332\377\225\243\234" \
+  "\377\202Slg\377\1\347\350\335\377\215\354\354\341\377\3\247\272\264\377" \
+  "\223\254\247\377\330\341\337\377\210\377\377\377\377\3\260\302\276\377" \
+  "\223\254\247\377\311\323\312\377\356\354\354\341\377\3\274\311\302\377" \
+  "\223\254\247\377\276\315\312\377\210\377\377\377\377\3\312\326\324\377" \
+  "\223\254\247\377\265\304\275\377\307\354\354\341\377\4\353\353\341\377" \
+  "\306\314\302\377\212\232\223\377Xqk\377\203Slg\377\1\347\350\335\377" \
+  "\214\354\354\341\377\4\332\337\325\377\223\254\247\377\234\263\256\377" \
+  "\374\375\375\377\207\377\377\377\377\4\356\362\361\377\223\254\247\377" \
+  "\224\254\247\377\342\345\332\377\356\354\354\341\377\17\340\344\331\377" \
+  "\224\255\247\377\227\257\252\377\370\372\371\377\371\372\372\377\343" \
+  "\352\350\377\316\332\327\377\324\336\334\377\352\357\356\377\375\375" \
+  "\375\377\377\377\377\377\365\367\367\377\225\256\251\377\226\256\251" \
+  "\377\345\347\335\377\304\354\354\341\377\3\334\336\324\377\242\256\246" \
+  "\377h~x\377\206Slg\377\1\347\350\335\377\214\354\354\341\377\3\265\304" \
+  "\275\377\223\254\247\377\306\323\321\377\210\377\377\377\377\4\301\317" \
+  "\315\377\223\254\247\377\224\255\250\377\272\310\300\377\357\354\354" \
+  "\341\377\4\256\277\270\377\223\254\247\377\254\277\274\377\224\255\250" \
+  "\377\204\223\254\247\377\6\233\262\255\377\332\342\341\377\377\377\377" \
+  "\377\270\311\305\377\223\254\247\377\303\316\306\377\301\354\354\341" \
+  "\377\4\351\351\337\377\272\302\271\377\177\221\212\377Unh\377\210Slg" \
+  "\377\1\347\350\335\377\213\354\354\341\377\4\346\347\335\377\226\256" \
+  "\251\377\224\255\250\377\362\365\365\377\207\377\377\377\377\5\372\373" \
+  "\373\377\231\261\254\377\223\254\247\377\256\301\275\377\245\271\263" \
+  "\377\357\354\354\341\377\17\311\323\313\377\224\256\250\377\224\255\250" \
+  "\377\300\317\314\377\342\351\347\377\367\371\370\377\361\364\363\377" \
+  "\333\343\341\377\254\277\274\377\223\254\247\377\270\310\305\377\344" \
+  "\352\351\377\223\254\247\377\236\264\256\377\353\353\341\377\276\354" \
+  "\354\341\377\3\322\326\314\377\227\245\236\377`wq\377\213Slg\377\1\347" \
+  "\350\335\377\213\354\354\341\377\3\303\317\306\377\223\254\247\377\265" \
+  "\306\303\377\210\377\377\377\377\6\323\335\333\377\223\254\247\377\262" \
+  "\304\300\377\311\325\323\377\226\256\251\377\351\352\340\377\355\354" \
+  "\354\341\377\4\352\353\340\377\245\271\263\377\234\262\256\377\346\353" \
+  "\352\377\205\377\377\377\377\7\376\376\376\377\313\327\325\377\223\254" \
+  "\247\377\312\327\324\377\247\273\267\377\223\254\247\377\321\331\317" \
+  "\377\273\354\354\341\377\3\344\345\333\377\257\271\261\377t\210\201\377" \
+  "\213Slg\377\1cys\377\202Slg\377\1\347\350\335\377\212\354\354\341\377" \
+  "\4\353\353\341\377\237\264\257\377\223\254\247\377\342\351\350\377\210" \
+  "\377\377\377\377\6\246\272\266\377\223\254\247\377\337\347\345\377\316" \
+  "\331\327\377\223\254\247\377\350\351\336\377\355\354\354\341\377\3\302" \
+  "\316\305\377\223\254\247\377\337\346\345\377\210\377\377\377\377\5\271" \
+  "\311\306\377\225\256\251\377\310\326\323\377\223\254\247\377\254\276" \
+  "\267\377\271\354\354\341\377\3\307\315\304\377\214\234\224\377Yql\377" \
+  "\212Slg\377\4axr\377\231\247\237\377\323\327\315\377\267\300\267\377" \
+  "\202Slg\377\1\347\350\335\377\212\354\354\341\377\3\322\331\320\377\223" \
+  "\254\247\377\244\271\265\377\205\377\377\377\377\11\363\366\365\377\364" \
+  "\366\366\377\377\377\377\377\344\352\351\377\223\254\247\377\241\267" \
+  "\263\377\376\376\376\377\270\310\305\377\241\266\261\377\356\354\354" \
+  "\341\377\2\240\265\257\377\263\305\301\377\211\377\377\377\377\6\370" \
+  "\372\371\377\226\257\252\377\306\323\321\377\232\261\254\377\223\254" \
+  "\247\377\337\343\331\377\265\354\354\341\377\3\335\337\325\377\244\260" \
+  "\250\377i\177y\377\212Slg\377\4Voi\377\203\224\215\377\276\305\274\377" \
+  "\352\352\337\377\202\354\354\341\377\1\267\300\267\377\202Slg\377\1\347" \
+  "\350\335\377\212\354\354\341\377\3\254\276\270\377\223\254\247\377\321" \
+  "\334\331\377\204\377\377\377\377\12\320\333\330\377\224\255\250\377\225" \
+  "\255\250\377\323\335\333\377\267\310\304\377\223\254\247\377\316\331" \
+  "\327\377\367\371\370\377\234\263\256\377\263\303\274\377\355\354\354" \
+  "\341\377\3\346\350\335\377\224\255\250\377\315\330\326\377\212\377\377" \
+  "\377\377\5\252\276\272\377\261\303\277\377\303\321\316\377\223\254\247" \
+  "\377\272\310\301\377\243\354\354\341\377\7\343\344\332\377\257\271\260" \
+  "\377\223\241\232\377\203\224\215\377\246\262\252\377\320\324\313\377" \
+  "\353\353\341\377\210\354\354\341\377\4\352\352\337\377\274\304\273\377" \
+  "\201\222\213\377Unh\377\213Slg\377\2\226\244\234\377\337\341\326\377" \
+  "\205\354\354\341\377\1\267\300\267\377\202Slg\377\1\347\350\335\377\212" \
+  "\354\354\341\377\202\224\255\250\377\1\371\372\372\377\204\377\377\377" \
+  "\377\12\243\271\264\377\250\274\270\377\245\272\265\377\244\272\265\377" \
+  "\225\255\250\377\227\257\252\377\367\371\371\377\270\310\305\377\225" \
+  "\256\251\377\334\341\327\377\355\354\354\341\377\3\330\335\324\377\223" \
+  "\254\247\377\336\346\344\377\212\377\377\377\377\5\275\314\311\377\240" \
+  "\266\261\377\353\357\356\377\223\254\247\377\240\265\257\377\242\354" \
+  "\354\341\377\2\306\314\302\377e{u\377\205Slg\377\2h~x\377\334\336\324" \
+  "\377\205\354\354\341\377\3\324\330\316\377\231\246\236\377axr\377\212" \
+  "Slg\377\2[sn\377\202\224\215\377\202Slg\377\1\301\310\277\377\206\354" \
+  "\354\341\377\1\323\327\315\377\202\244\260\250\377\1\352\352\340\377" \
+  "\212\354\354\341\377\3\227\257\252\377\223\254\247\377\376\376\376\377" \
+  "\204\377\377\377\377\1\272\312\307\377\202\223\254\247\377\6\251\274" \
+  "\271\377\223\254\247\377\272\312\307\377\275\314\311\377\223\254\247" \
+  "\377\300\315\305\377\356\354\354\341\377\3\343\346\333\377\223\254\247" \
+  "\377\321\334\331\377\212\377\377\377\377\202\256\301\275\377\3\355\361" \
+  "\361\377\223\254\247\377\242\267\261\377\241\354\354\341\377\2\306\314" \
+  "\303\377Tmh\377\207Slg\377\6o\203}\377\344\345\332\377\354\354\341\377" \
+  "\345\346\333\377\261\272\262\377v\211\203\377\212Slg\377\5Tmg\377y\214" \
+  "\205\377\264\275\264\377\346\347\334\377\324\330\316\377\202Slg\377\1" \
+  "\301\310\277\377\224\354\354\341\377\3\233\262\254\377\223\254\247\377" \
+  "\371\373\373\377\204\377\377\377\377\11\371\372\372\377\320\333\331\377" \
+  "\321\333\331\377\235\263\257\377\223\254\247\377\235\263\257\377\225" \
+  "\255\251\377\277\313\303\377\353\353\340\377\357\354\354\341\377\2\234" \
+  "\262\255\377\272\312\307\377\211\377\377\377\377\6\375\375\375\377\231" \
+  "\261\254\377\303\321\316\377\351\356\355\377\223\254\247\377\246\272" \
+  "\263\377\240\354\354\341\377\2\344\345\333\377f|v\377\202Slg\377\5\202" \
+  "\224\215\377\316\323\311\377\344\345\332\377\306\314\302\377s\207\201" \
+  "\377\202Slg\377\3y\214\205\377\216\235\226\377Zrm\377\212Slg\377\3dz" \
+  "t\377\235\252\242\377\327\332\320\377\203\354\354\341\377\1\324\330\316" \
+  "\377\202Slg\377\1\301\310\277\377\224\354\354\341\377\3\237\264\257\377" \
+  "\223\254\247\377\365\367\367\377\206\377\377\377\377\5\332\343\341\377" \
+  "\223\254\247\377\225\255\250\377\255\277\267\377\332\337\325\377\361" \
+  "\354\354\341\377\3\267\306\277\377\226\256\251\377\354\360\357\377\210" \
+  "\377\377\377\377\6\311\326\323\377\223\254\247\377\342\351\350\377\344" \
+  "\352\351\377\223\254\247\377\252\274\266\377\240\354\354\341\377\1\257" \
+  "\271\261\377\202Slg\377\1\204\225\216\377\204\354\354\341\377\2\350\351" \
+  "\336\377m\202|\377\213Slg\377\4Woj\377\205\226\217\377\300\307\276\377" \
+  "\353\353\340\377\205\354\354\341\377\1\324\330\316\377\202Slg\377\1\301" \
+  "\310\277\377\224\354\354\341\377\3\242\267\261\377\223\254\247\377\360" \
+  "\363\363\377\206\377\377\377\377\3\255\300\274\377\223\254\247\377\314" \
+  "\325\314\377\363\354\354\341\377\4\347\350\336\377\234\263\255\377\247" \
+  "\273\267\377\365\370\367\377\206\377\377\377\377\7\342\351\347\377\225" \
+  "\255\250\377\273\313\310\377\377\377\377\377\340\347\345\377\223\254" \
+  "\247\377\256\277\270\377\240\354\354\341\377\1\221\240\230\377\202Sl" \
+  "g\377\1\320\325\313\377\205\354\354\341\377\1\264\275\264\377\211Slg" \
+  "\377\3o\203}\377\251\264\254\377\341\342\330\377\210\354\354\341\377" \
+  "\1\324\330\316\377\202Slg\377\1\301\310\277\377\224\354\354\341\377\3" \
+  "\246\272\264\377\223\254\247\377\353\360\357\377\205\377\377\377\377" \
+  "\4\354\360\357\377\223\254\247\377\233\262\254\377\352\352\340\377\364" \
+  "\354\354\341\377\5\325\333\322\377\226\256\252\377\233\262\256\377\327" \
+  "\340\337\377\367\370\370\377\202\377\377\377\377\11\360\364\363\377\303" \
+  "\321\316\377\223\254\247\377\244\271\265\377\371\372\372\377\377\377" \
+  "\377\377\333\344\342\377\223\254\247\377\261\302\273\377\240\354\354" \
+  "\341\377\1|\216\210\377\202Slg\377\1\345\346\333\377\205\354\354\341" \
+  "\377\1\310\316\304\377\206Slg\377\3]to\377\222\241\231\377\315\322\310" \
+  "\377\213\354\354\341\377\1\324\330\316\377\202Slg\377\1\301\310\277\377" \
+  "\224\354\354\341\377\3\252\275\266\377\223\254\247\377\346\354\353\377" \
+  "\205\377\377\377\377\3\276\315\312\377\223\254\247\377\276\313\303\377" \
+  "\366\354\354\341\377\2\340\344\331\377\251\274\265\377\202\223\254\247" \
+  "\377\2\236\264\260\377\230\257\253\377\202\223\254\247\377\2\304\322" \
+  "\317\377\374\374\374\377\202\377\377\377\377\3\327\340\336\377\223\254" \
+  "\247\377\265\305\275\377\240\354\354\341\377\1\224\243\233\377\202Sl" \
+  "g\377\1\314\321\310\377\205\354\354\341\377\1\257\271\261\377\204Slg" \
+  "\377\3Tmg\377\235\252\242\377\347\350\335\377\215\354\354\341\377\1\324" \
+  "\330\316\377\202Slg\377\1\301\310\277\377\224\354\354\341\377\3\256\277" \
+  "\271\377\223\254\247\377\342\351\347\377\204\377\377\377\377\4\371\372" \
+  "\372\377\230\260\253\377\224\255\250\377\342\345\332\377\370\354\354" \
+  "\341\377\6\327\335\323\377\304\317\307\377\253\275\267\377\223\254\247" \
+  "\377\233\262\256\377\357\362\362\377\204\377\377\377\377\3\323\335\333" \
+  "\377\223\254\247\377\271\307\300\377\240\354\354\341\377\1\264\275\265" \
+  "\377\202Slg\377\2{\216\207\377\352\352\340\377\203\354\354\341\377\2" \
+  "\345\346\333\377g}w\377\206Slg\377\3u\211\202\377\261\272\262\377\345" \
+  "\346\333\377\213\354\354\341\377\1\324\330\316\377\202Slg\377\1\301\310" \
+  "\277\377\224\354\354\341\377\3\262\302\273\377\223\254\247\377\335\345" \
+  "\343\377\204\377\377\377\377\3\320\333\331\377\223\254\247\377\257\300" \
+  "\271\377\374\354\354\341\377\3\242\267\261\377\223\254\247\377\336\345" \
+  "\344\377\204\377\377\377\377\3\316\331\327\377\223\254\247\377\275\312" \
+  "\302\377\240\354\354\341\377\2\350\351\336\377o\204}\377\202Slg\377\5" \
+  "t\210\201\377\272\302\271\377\315\322\310\377\262\273\263\377g}w\377" \
+  "\202Slg\377\3\200\222\213\377\227\245\236\377`wq\377\204Slg\377\3Zrm" \
+  "\377\216\235\226\377\311\317\305\377\211\354\354\341\377\1\324\330\316" \
+  "\377\202Slg\377\1\301\310\277\377\224\354\354\341\377\3\266\305\276\377" \
+  "\223\254\247\377\330\341\337\377\204\377\377\377\377\3\243\270\264\377" \
+  "\223\254\247\377\325\333\322\377\374\354\354\341\377\3\307\321\311\377" \
+  "\223\254\247\377\260\302\277\377\204\377\377\377\377\3\312\326\324\377" \
+  "\223\254\247\377\301\315\305\377\241\354\354\341\377\2\321\325\313\377" \
+  "Yql\377\207Slg\377\7v\211\203\377\347\347\335\377\354\354\341\377\351" \
+  "\351\337\377\273\303\272\377\201\222\213\377Unh\377\204Slg\377\3l\201" \
+  "{\377\247\262\252\377\337\341\327\377\206\354\354\341\377\1\324\330\316" \
+  "\377\202Slg\377\1\301\310\277\377\224\354\354\341\377\3\271\310\300\377" \
+  "\223\254\247\377\323\335\333\377\203\377\377\377\377\3\341\350\347\377" \
+  "\223\254\247\377\241\266\260\377\375\354\354\341\377\4\347\351\336\377" \
+  "\230\257\252\377\223\254\247\377\356\362\362\377\203\377\377\377\377" \
+  "\3\305\322\320\377\223\254\247\377\305\320\307\377\242\354\354\341\377" \
+  "\2\325\331\317\377u\210\202\377\204Slg\377\3Tmg\377v\211\203\377\341" \
+  "\343\330\377\205\354\354\341\377\3\335\337\325\377\245\260\250\377j\177" \
+  "y\377\204Slg\377\4Voi\377\204\225\216\377\300\307\276\377\352\352\340" \
+  "\377\203\354\354\341\377\1\324\330\316\377\202Slg\377\1\301\310\277\377" \
+  "\224\354\354\341\377\3\275\312\303\377\223\254\247\377\317\332\330\377" \
+  "\203\377\377\377\377\3\264\305\302\377\223\254\247\377\306\321\310\377" \
+  "\376\354\354\341\377\3\270\307\277\377\223\254\247\377\302\320\315\377" \
+  "\203\377\377\377\377\3\300\317\314\377\223\254\247\377\310\322\312\377" \
+  "\243\354\354\341\377\6\352\352\340\377\306\314\303\377\250\263\252\377" \
+  "\226\244\234\377\270\300\267\377\337\341\326\377\212\354\354\341\377" \
+  "\3\310\316\304\377\215\235\225\377Zrm\377\204Slg\377\5dzt\377\235\252" \
+  "\242\377\330\333\321\377\354\354\341\377\324\330\316\377\202Slg\377\1" \
+  "\301\310\277\377\224\354\354\341\377\3\301\315\305\377\223\254\247\377" \
+  "\312\326\324\377\202\377\377\377\377\4\362\365\364\377\224\255\250\377" \
+  "\227\257\252\377\347\350\336\377\376\354\354\341\377\4\336\342\330\377" \
+  "\223\254\247\377\231\261\254\377\372\373\373\377\202\377\377\377\377" \
+  "\3\274\314\310\377\223\254\247\377\314\325\314\377\265\354\354\341\377" \
+  "\3\345\346\333\377\261\273\262\377v\212\203\377\204Slg\377\3Tmg\377{" \
+  "\215\207\377\243\257\247\377\202Slg\377\1\301\310\277\377\206\354\354" \
+  "\341\377\1\342\344\331\377\202\317\324\312\377\1\353\353\341\377\212" \
+  "\354\354\341\377\10\305\320\310\377\223\254\247\377\250\274\270\377\316" \
+  "\332\327\377\342\351\347\377\301\317\314\377\223\254\247\377\270\307" \
+  "\277\377\377\354\354\341\377\11\354\354\341\377\252\275\266\377\223\254" \
+  "\247\377\314\330\325\377\337\347\345\377\314\330\325\377\242\270\263" \
+  "\377\223\254\247\377\320\330\317\377\270\354\354\341\377\3\325\330\316" \
+  "\377\232\250\240\377bys\377\206Slg\377\1\256\270\257\377\206\354\354" \
+  "\341\377\1\267\300\267\377\202Slg\377\1\347\350\335\377\212\354\354\341" \
+  "\377\1\311\323\312\377\206\223\254\247\377\1\335\341\327\377\377\354" \
+  "\354\341\377\2\354\354\341\377\317\327\316\377\206\223\254\247\377\1" \
+  "\324\333\321\377\272\354\354\341\377\4\352\352\337\377\276\305\274\377" \
+  "\203\224\215\377Voi\377\204Slg\377\3j\200z\377\245\260\250\377\335\337" \
+  "\325\377\203\354\354\341\377\1\267\300\267\377\202Slg\377\1\347\350\335" \
+  "\377\212\354\354\341\377\7\350\351\336\377\277\310\300\377m\206\201\377" \
+  "w\220\213\377\202\233\226\377\225\255\250\377\251\274\265\377\377\354" \
+  "\354\341\377\202\354\354\341\377\10\353\353\340\377\235\264\256\377\224" \
+  "\253\246\377\200\231\224\377v\217\212\377s\213\205\377\311\320\307\377" \
+  "\352\352\337\377\275\354\354\341\377\3\337\341\326\377\247\262\252\377" \
+  "l\201{\377\204Slg\377\5Unh\377\200\222\213\377\273\303\272\377\351\351" \
+  "\337\377\267\300\267\377\202Slg\377\1\347\350\335\377\213\354\354\341" \
+  "\377\1\261\272\262\377\203Slg\377\2\306\314\302\377\353\353\340\377\377" \
+  "\354\354\341\377\203\354\354\341\377\6\353\353\340\377\276\306\274\377" \
+  "Zrn\377Slg\377Yql\377\274\304\272\377\301\354\354\341\377\3\313\320\307" \
+  "\377\220\237\230\377[sn\377\204Slg\377\2_vq\377x\213\205\377\202Slg\377" \
+  "\1\347\350\335\377\213\354\354\341\377\1\257\271\261\377\202Slg\377\2" \
+  "Woj\377\342\343\331\377\377\354\354\341\377\205\354\354\341\377\2\331" \
+  "\334\323\377bys\377\202Slg\377\1\234\251\242\377\303\354\354\341\377" \
+  "\4\346\347\334\377\264\275\264\377y\214\205\377Tmg\377\205Slg\377\1\347" \
+  "\350\335\377\213\354\354\341\377\1\303\312\300\377\202Slg\377\1\222\241" \
+  "\231\377\377\354\354\341\377\207\354\354\341\377\4e{u\377Slg\377_vq\377" \
+  "\317\324\312\377\306\354\354\341\377\3\327\332\320\377\235\252\242\377" \
+  "dzt\377\203Slg\377\1\347\350\335\377\213\354\354\341\377\4\327\332\320" \
+  "\377Slg\377Wpj\377\333\336\324\377\377\354\354\341\377\207\354\354\341" \
+  "\377\3m\202|\377Xok\377\227\245\235\377\311\354\354\341\377\2\353\353" \
+  "\340\377\242\256\246\377\202Slg\377\1\347\350\335\377\213\354\354\341" \
+  "\377\3\351\351\337\377Tmh\377\224\242\233\377\377\354\354\341\377\210" \
+  "\354\354\341\377\3\207\227\220\377g}w\377\351\351\337\377\312\354\354" \
+  "\341\377\1\267\300\267\377\202Slg\377\1\347\350\335\377\214\354\354\341" \
+  "\377\2j\177y\377\334\337\325\377\377\354\354\341\377\210\354\354\341" \
+  "\377\2\324\330\316\377\326\332\317\377\313\354\354\341\377\1\267\300" \
+  "\267\377\202Slg\377\1\347\350\335\377\214\354\354\341\377\1\273\303\272" \
+  "\377\377\354\354\341\377\326\354\354\341\377\1\336\340\326\377\202\301" \
+  "\310\277\377\1\353\353\340\377\212\354\354\341\377")
 
 
diff --git a/packages/psplash/files/configurability.patch b/packages/psplash/files/configurability.patch
index b923cb24f1..c9688655c9 100644
--- a/packages/psplash/files/configurability.patch
+++ b/packages/psplash/files/configurability.patch
@@ -1,8 +1,8 @@
 Index: psplash/psplash.c
 ===================================================================
---- psplash.orig/psplash.c
-+++ psplash/psplash.c
-@@ -44,17 +44,17 @@ psplash_draw_msg (PSplashFB *fb, const c
+--- psplash.orig/psplash.c	2007-12-06 11:14:23.000000000 +0000
++++ psplash/psplash.c	2007-12-06 11:19:12.000000000 +0000
+@@ -44,17 +44,17 @@
  
    /* Clear */
  
@@ -27,7 +27,7 @@ Index: psplash/psplash.c
  			&radeon_font,
  			msg);
  }
-@@ -66,36 +66,36 @@ psplash_draw_progress (PSplashFB *fb, in
+@@ -66,36 +66,36 @@
  
    /* 4 pix border */
    x      = ((fb->width  - BAR_IMG_WIDTH)/2) + 4 ;
@@ -75,7 +75,7 @@ Index: psplash/psplash.c
  {
    char *command;
    int   parsed=0;
-@@ -103,21 +103,21 @@ parse_command (PSplashFB *fb, char *stri
+@@ -103,21 +103,21 @@
    parsed = strlen(string)+1;
  
    DBG("got cmd %s", string);
@@ -103,7 +103,7 @@ Index: psplash/psplash.c
      {
        return 1;
      }
-@@ -125,8 +125,8 @@ parse_command (PSplashFB *fb, char *stri
+@@ -125,8 +125,8 @@
    return 0;
  }
  
@@ -114,7 +114,7 @@ Index: psplash/psplash.c
  {
    int            err;
    ssize_t        length = 0;
-@@ -143,14 +143,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+@@ -143,14 +143,14 @@
  
    end = command;
  
@@ -133,7 +133,7 @@ Index: psplash/psplash.c
  	{
  	  /*
  	  if (errno == EINTR)
-@@ -158,29 +158,29 @@ psplash_main (PSplashFB *fb, int pipe_fd
+@@ -158,29 +158,29 @@
  	  */
  	  return;
  	}
@@ -171,7 +171,7 @@ Index: psplash/psplash.c
        FD_ZERO(&descriptors);
        FD_SET(pipe_fd,&descriptors);
      }
-@@ -188,14 +188,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+@@ -188,14 +188,14 @@
    return;
  }
  
@@ -189,7 +189,7 @@ Index: psplash/psplash.c
    signal(SIGHUP, psplash_exit);
    signal(SIGINT, psplash_exit);
    signal(SIGQUIT, psplash_exit);
-@@ -214,10 +214,10 @@ main (int argc, char** argv) 
+@@ -214,10 +214,10 @@
  	  angle = atoi(argv[i]);
  	  continue;
  	}
@@ -203,7 +203,7 @@ Index: psplash/psplash.c
  	      argv[0]);
        exit(-1);
      }
-@@ -231,7 +231,7 @@ main (int argc, char** argv) 
+@@ -231,7 +231,7 @@
  
    if (mkfifo(PSPLASH_FIFO, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP))
      {
@@ -212,7 +212,7 @@ Index: psplash/psplash.c
  	{
  	  perror("mkfifo");
  	  exit(-1);
-@@ -239,8 +239,8 @@ main (int argc, char** argv) 
+@@ -239,8 +239,8 @@
      }
  
    pipe_fd = open (PSPLASH_FIFO,O_RDONLY|O_NONBLOCK);
@@ -223,22 +223,20 @@ Index: psplash/psplash.c
      {
        perror("pipe open");
        exit(-2);
-@@ -252,30 +252,30 @@ main (int argc, char** argv) 
-   if ((fb = psplash_fb_new(angle)) == NULL)
+@@ -253,29 +253,29 @@
      exit(-1);
  
--  /* Clear the background with #ecece1 */
+   /* Clear the background with #ecece1 */
 -  psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1);
-+  /* Clear the background */
 +  psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
  
    /* Draw the OH logo  */
 -  psplash_fb_draw_image (fb, 
 -			 (fb->width  - HAND_IMG_WIDTH)/2, 
--			 (fb->height - HAND_IMG_HEIGHT)/2, 
+-			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
 +  psplash_fb_draw_image (fb,
-+			 (fb->width  - HAND_IMG_WIDTH)/2,
-+			 (fb->height - HAND_IMG_HEIGHT)/2,
++                         (fb->width  - HAND_IMG_WIDTH)/2,
++                         (fb->height - HAND_IMG_HEIGHT)/2,
  			 HAND_IMG_WIDTH,
  			 HAND_IMG_HEIGHT,
  			 HAND_IMG_BYTES_PER_PIXEL,
@@ -249,8 +247,8 @@ Index: psplash/psplash.c
 -			 (fb->width  - BAR_IMG_WIDTH)/2, 
 -			 fb->height - (fb->height/6), 
 +  psplash_fb_draw_image (fb,
-+			 (fb->width  - BAR_IMG_WIDTH)/2,
-+			 fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER),
++                         (fb->width  - BAR_IMG_WIDTH)/2,
++                         fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER),
  			 BAR_IMG_WIDTH,
  			 BAR_IMG_HEIGHT,
  			 BAR_IMG_BYTES_PER_PIXEL,
@@ -266,9 +264,9 @@ Index: psplash/psplash.c
  
 Index: psplash/psplash.h
 ===================================================================
---- psplash.orig/psplash.h
-+++ psplash/psplash.h
-@@ -54,6 +54,21 @@ typedef int            bool;
+--- psplash.orig/psplash.h	2007-12-06 11:15:35.000000000 +0000
++++ psplash/psplash.h	2007-12-06 11:15:45.000000000 +0000
+@@ -54,6 +54,21 @@
  #define TRUE 1
  #endif
  
diff --git a/packages/psplash/files/logo-math.patch b/packages/psplash/files/logo-math.patch
new file mode 100644
index 0000000000..87574b1855
--- /dev/null
+++ b/packages/psplash/files/logo-math.patch
@@ -0,0 +1,13 @@
+Do better math when showing logo vs progressbar.
+
+--- psplash/psplash.c.org	2007-09-22 20:33:36.000000000 +0300
++++ psplash/psplash.c	2007-12-01 21:27:08.000000000 +0200
+@@ -258,7 +258,7 @@
+   /* Draw the OH logo  */
+   psplash_fb_draw_image (fb, 
+ 			 (fb->width  - HAND_IMG_WIDTH)/2, 
+-			 (fb->height - HAND_IMG_HEIGHT)/2, 
++			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
+ 			 HAND_IMG_WIDTH,
+ 			 HAND_IMG_HEIGHT,
+ 			 HAND_IMG_BYTES_PER_PIXEL,
diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init
index 2bd83cfb07..5587346cb1 100644
--- a/packages/psplash/files/psplash-init
+++ b/packages/psplash/files/psplash-init
@@ -19,3 +19,5 @@ export TMPDIR=/mnt/.psplash
 mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
 /usr/bin/psplash $psplash_args &
+
+(sleep 120; psplash-write "QUIT") &
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index 98e2a36805..cf6e228d92 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.o-hand.com/psplash"
 SECTION = "base"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r9"
+PR = "r11"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND
@@ -17,6 +17,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
           file://psplash-init"
 S = "${WORKDIR}/psplash"
 
+# This really should be default, but due yo openmoko hack below, can't be easily
+SRC_URI_append_angstrom = " file://logo-math.patch;patch=1 "
 SRC_URI_append_openmoko = " file://configurability.patch;patch=1 "
 
 inherit autotools pkgconfig update-rc.d
diff --git a/packages/pulseaudio/files/fix-dbus-without-hal.patch b/packages/pulseaudio/files/fix-dbus-without-hal.patch
new file mode 100644
index 0000000000..f8ac5674a6
--- /dev/null
+++ b/packages/pulseaudio/files/fix-dbus-without-hal.patch
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.8/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.8.orig/src/Makefile.am
++++ pulseaudio-0.9.8/src/Makefile.am
+@@ -1424,8 +1424,8 @@
+ # HAL
+ libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
+ libdbus_util_la_LDFLAGS = -avoid-version
+-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
+-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
++libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la
++libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
+ 
+ module_hal_detect_la_SOURCES = modules/module-hal-detect.c
+ module_hal_detect_la_LDFLAGS = -module -avoid-version
diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index f765bec1a1..b6b622d9c6 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.pulseaudio.org"
 AUTHOR = "Lennart Poettering"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal"
 # optional
 DEPENDS += "alsa-lib glib-2.0"
 
@@ -21,6 +20,7 @@ EXTRA_OECONF = "\
 		--with-glib \
 		--with-alsa \
 		--with-oss \
+                --with-hal \
 		"
 
 PARALLEL_MAKE = ""
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index a93c8ee251..aa07afe6fe 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,4 @@
 require pulse.inc
 
-PR = "r5"
+PR = "r6"
 
diff --git a/packages/pulseaudio/pulseaudio_0.9.7.bb b/packages/pulseaudio/pulseaudio_0.9.7.bb
deleted file mode 100644
index d466086b50..0000000000
--- a/packages/pulseaudio/pulseaudio_0.9.7.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require pulse.inc
-
-# this is not correct (see below)
-SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
-
-PR = "r0"
-
-# problems w/ pulseaudio 0.9.7 atm:
-# 1.) needs libtool 1.2.24 (which miscompiles plugins in OE, hence we can't make it the default yet)
-# 2.) doesn't build w/ glibc TLS support (hence patched out)
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/pulseaudio/pulseaudio_0.9.8.bb b/packages/pulseaudio/pulseaudio_0.9.8.bb
new file mode 100644
index 0000000000..93c8ffb849
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio_0.9.8.bb
@@ -0,0 +1,17 @@
+require pulse.inc
+
+DEPENDS += "dbus"
+
+# this is not correct (see below)
+SRC_URI += "\
+  file://disable-using-glibc-tls.patch;patch=1 \
+  file://fix-dbus-without-hal.patch;patch=1 \
+"            
+
+PR = "r0"
+
+# problems w/ pulseaudio 0.9.8 atm:
+# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+DEFAULT_PREFERENCE = "-1"
+
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 85d47c4c0d..f899eb2fea 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Nov 15 16:11:01 2007
+### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Dec  7 11:51:27 2007
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -8,287 +8,292 @@
 ########################################################################################################################
  
 
-PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
 DESCRIPTION_python-profile="Python Basic Profiling Support"
-PR_python-profile="ml2"
+PR_python-profile="ml5"
 RDEPENDS_python-profile="python-core"
 FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml2"
+PR_python-threading="ml5"
 RDEPENDS_python-threading="python-core python-lang"
 FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utilities"
-PR_python-distutils="ml2"
+PR_python-distutils="ml5"
 RDEPENDS_python-distutils="python-core"
 FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml2"
+PR_python-textutils="ml5"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
 FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* "
 
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml2"
-RDEPENDS_python-codecs="python-core"
+PR_python-codecs="ml5"
+RDEPENDS_python-codecs="python-core python-lang"
 FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* "
 
+DESCRIPTION_python-ctypes="Python C Types Support"
+PR_python-ctypes="ml5"
+RDEPENDS_python-ctypes="python-core"
+FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so "
+
 DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml2"
+PR_python-pickle="ml5"
 RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
 FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-datetime="Python Calendar and Time support"
-PR_python-datetime="ml2"
+PR_python-datetime="ml5"
 RDEPENDS_python-datetime="python-core python-codecs"
 FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml4"
+PR_python-core="ml5"
 RDEPENDS_python-core=""
 FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml2"
+PR_python-io="ml5"
 RDEPENDS_python-io="python-core python-math"
 FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml2"
+PR_python-compiler="ml5"
 RDEPENDS_python-compiler="python-core"
 FILES_python-compiler="${libdir}/python2.5/compiler "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml2"
+PR_python-compression="ml5"
 RDEPENDS_python-compression="python-core python-zlib"
 FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml2"
+PR_python-re="ml5"
 RDEPENDS_python-re="python-core"
 FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml2"
+PR_python-xmlrpc="ml5"
 RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
 FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml2"
+PR_python-terminal="ml5"
 RDEPENDS_python-terminal="python-core python-io"
 FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml2"
+PR_python-email="ml5"
 RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
 FILES_python-email="${libdir}/python2.5/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml2"
+PR_python-image="ml5"
 RDEPENDS_python-image="python-core"
 FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
 
 DESCRIPTION_python-core-dbg="Python core module debug information"
-PR_python-core-dbg="ml2"
+PR_python-core-dbg="ml5"
 RDEPENDS_python-core-dbg="python-core"
 FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml2"
+PR_python-resource="ml5"
 RDEPENDS_python-resource="python-core"
 FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
 
 DESCRIPTION_python-devel="Python Development Package"
-PR_python-devel="ml2"
+PR_python-devel="ml5"
 RDEPENDS_python-devel="python-core"
 FILES_python-devel="${includedir} ${libdir}/python2.5/config "
 
 DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml2"
+PR_python-math="ml5"
 RDEPENDS_python-math="python-core"
 FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* "
 
 DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml2"
+PR_python-hotshot="ml5"
 RDEPENDS_python-hotshot="python-core"
 FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so "
 
 DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml2"
+PR_python-unixadmin="ml5"
 RDEPENDS_python-unixadmin="python-core"
 FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* "
 
 DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml2"
+PR_python-syslog="ml5"
 RDEPENDS_python-syslog="python-core"
 FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
 
 DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
-PR_python-tkinter="ml2"
+PR_python-tkinter="ml5"
 RDEPENDS_python-tkinter="python-core"
 FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk "
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml2"
+PR_python-gdbm="ml5"
 RDEPENDS_python-gdbm="python-core"
 FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml2"
+PR_python-fcntl="ml5"
 RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml2"
-RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
+PR_python-netclient="ml5"
+RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime"
 FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml2"
+PR_python-pprint="ml5"
 RDEPENDS_python-pprint="python-core"
 FILES_python-pprint="${libdir}/python2.5/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml2"
+PR_python-netserver="ml5"
 RDEPENDS_python-netserver="python-core python-netclient"
 FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml2"
+PR_python-curses="ml5"
 RDEPENDS_python-curses="python-core"
 FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
-PR_python-smtpd="ml2"
+PR_python-smtpd="ml5"
 RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
 FILES_python-smtpd="${bindir}/smtpd.* "
 
 DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml2"
+PR_python-html="ml5"
 RDEPENDS_python-html="python-core"
 FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* "
 
 DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml2"
+PR_python-readline="ml5"
 RDEPENDS_python-readline="python-core"
 FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* "
 
 DESCRIPTION_python-subprocess="Python Subprocess Support"
-PR_python-subprocess="ml2"
+PR_python-subprocess="ml5"
 RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
 FILES_python-subprocess="${libdir}/python2.5/subprocess.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
-PR_python-pydoc="ml2"
+PR_python-pydoc="ml5"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
 FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* "
 
 DESCRIPTION_python-logging="Python Logging Support"
-PR_python-logging="ml2"
+PR_python-logging="ml5"
 RDEPENDS_python-logging="python-core python-io python-lang python-stringold"
 FILES_python-logging="${libdir}/python2.5/logging "
 
 DESCRIPTION_python-mailbox="Python Mailbox Format Support"
-PR_python-mailbox="ml2"
+PR_python-mailbox="ml5"
 RDEPENDS_python-mailbox="python-core python-mime"
 FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml2"
+PR_python-xml="ml5"
 RDEPENDS_python-xml="python-core python-re python-netclient"
 FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
-PR_python-mime="ml2"
+PR_python-mime="ml5"
 RDEPENDS_python-mime="python-core python-io"
 FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
 
 DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml2"
+PR_python-sqlite3="ml5"
 RDEPENDS_python-sqlite3="python-core"
 FILES_python-sqlite3="${libdir}/python2.5/sqlite3 "
 
 DESCRIPTION_python-tests="Python Tests"
-PR_python-tests="ml2"
+PR_python-tests="ml5"
 RDEPENDS_python-tests="python-core"
 FILES_python-tests="${libdir}/python2.5/test "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
-PR_python-unittest="ml2"
+PR_python-unittest="ml5"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
 FILES_python-unittest="${libdir}/python2.5/unittest.* "
 
 DESCRIPTION_python-stringold="Python String APIs [deprecated]"
-PR_python-stringold="ml2"
+PR_python-stringold="ml5"
 RDEPENDS_python-stringold="python-core python-re"
 FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* "
 
 DESCRIPTION_python-robotparser="Python robots.txt parser"
-PR_python-robotparser="ml2"
+PR_python-robotparser="ml5"
 RDEPENDS_python-robotparser="python-core python-netclient"
 FILES_python-robotparser="${libdir}/python2.5/robotparser.* "
 
 DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries"
-PR_python-lib-old-and-deprecated="ml2"
+PR_python-lib-old-and-deprecated="ml5"
 RDEPENDS_python-lib-old-and-deprecated="python-core"
 FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old "
 
 DESCRIPTION_python-compile="Python Bytecode Compilation Support"
-PR_python-compile="ml2"
+PR_python-compile="ml5"
 RDEPENDS_python-compile="python-core"
 FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* "
 
 DESCRIPTION_python-debugger="Python Debugger"
-PR_python-debugger="ml2"
+PR_python-debugger="ml5"
 RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell"
 FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml2"
+PR_python-shell="ml5"
 RDEPENDS_python-shell="python-core python-re"
 FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* "
 
 DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
-PR_python-bsddb="ml2"
+PR_python-bsddb="ml5"
 RDEPENDS_python-bsddb="python-core"
 FILES_python-bsddb="${libdir}/python2.5/bsddb "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
-PR_python-mmap="ml2"
+PR_python-mmap="ml5"
 RDEPENDS_python-mmap="python-core python-io"
 FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
-PR_python-zlib="ml2"
+PR_python-zlib="ml5"
 RDEPENDS_python-zlib="python-core"
 FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
-PR_python-db="ml2"
+PR_python-db="ml5"
 RDEPENDS_python-db="python-core"
 FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-PR_python-crypt="ml2"
+PR_python-crypt="ml5"
 RDEPENDS_python-crypt="python-core"
 FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so "
 
 DESCRIPTION_python-idle="Python Integrated Development Environment"
-PR_python-idle="ml2"
+PR_python-idle="ml5"
 RDEPENDS_python-idle="python-core python-tkinter"
 FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
-PR_python-lang="ml2"
+PR_python-lang="ml5"
 RDEPENDS_python-lang="python-core"
 FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* "
 
 DESCRIPTION_python-audio="Python Audio Handling"
-PR_python-audio="ml2"
+PR_python-audio="ml5"
 RDEPENDS_python-audio="python-core"
 FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so "
 
diff --git a/packages/python/python-2.5.1/enable-ctypes-module.patch b/packages/python/python-2.5.1/enable-ctypes-module.patch
new file mode 100644
index 0000000000..dd5adaf0e7
--- /dev/null
+++ b/packages/python/python-2.5.1/enable-ctypes-module.patch
@@ -0,0 +1,106 @@
+diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py
+--- Python-2.5.orig/setup.py	2006-08-10 01:42:18.000000000 +0200
++++ Python-2.5/setup.py	2007-11-21 18:00:43.000000000 +0100
+@@ -1321,16 +1329,16 @@
+                                          ffi_configfile):
+                 from distutils.dir_util import mkpath
+                 mkpath(ffi_builddir)
+-                config_args = []
++                config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
+ 
+                 # Pass empty CFLAGS because we'll just append the resulting
+                 # CFLAGS to Python's; -g or -O2 is to be avoided.
+-                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
+-                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
++                cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
++                      % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
+ 
+                 res = os.system(cmd)
+                 if res or not os.path.exists(ffi_configfile):
+-                    print "Failed to configure _ctypes module"
++                    print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, )
+                     return False
+ 
+             fficonfig = {}
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c
+--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c	2006-10-17 21:41:10.000000000 +0200
++++ Python-2.5.1/Modules/_ctypes/callbacks.c	2007-11-22 10:29:33.000000000 +0100
+@@ -273,11 +273,13 @@
+ 		PyErr_NoMemory();
+ 		return NULL;
+ 	}
++#if FFI_CLOSURES
+ 	p->pcl = MallocClosure();
+ 	if (p->pcl == NULL) {
+ 		PyErr_NoMemory();
+ 		goto error;
+ 	}
++#endif
+ 
+ 	for (i = 0; i < nArgs; ++i) {
+ 		PyObject *cnv = PySequence_GetItem(converters, i);
+@@ -315,12 +317,14 @@
+ 			     "ffi_prep_cif failed with %d", result);
+ 		goto error;
+ 	}
++#if FFI_CLOSURES
+ 	result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
+ 	if (result != FFI_OK) {
+ 		PyErr_Format(PyExc_RuntimeError,
+ 			     "ffi_prep_closure failed with %d", result);
+ 		goto error;
+ 	}
++#endif
+ 
+ 	p->converters = converters;
+ 	p->callable = callable;
+@@ -328,8 +332,10 @@
+ 
+   error:
+ 	if (p) {
++#if FFI_CLOSURES
+ 		if (p->pcl)
+ 			FreeClosure(p->pcl);
++#endif
+ 		PyMem_Free(p);
+ 	}
+ 	return NULL;
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c
+--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c	2007-03-23 20:56:45.000000000 +0100
++++ Python-2.5.1/Modules/_ctypes/_ctypes.c	2007-11-22 10:29:01.000000000 +0100
+@@ -3419,7 +3419,9 @@
+ 	Py_CLEAR(self->paramflags);
+ 
+ 	if (self->thunk) {
++#if FFI_CLOSURES
+ 		FreeClosure(self->thunk->pcl);
++#endif
+ 		PyMem_Free(self->thunk);
+ 		self->thunk = NULL;
+ 	}
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h
+--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h	2006-08-14 13:17:48.000000000 +0200
++++ Python-2.5.1/Modules/_ctypes/ctypes.h	2007-11-22 10:29:44.000000000 +0100
+@@ -68,7 +68,9 @@
+ };
+ 
+ typedef struct {
++#if FFI_CLOSURES
+ 	ffi_closure *pcl; /* the C callable */
++#endif
+ 	ffi_cif cif;
+ 	PyObject *converters;
+ 	PyObject *callable;
+diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c
+--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c	2006-06-12 22:56:48.000000000 +0200
++++ Python-2.5.1/Modules/_ctypes/malloc_closure.c	2007-11-22 10:30:17.000000000 +0100
+@@ -27,7 +27,9 @@
+ /******************************************************************/
+ 
+ typedef union _tagITEM {
++#if FFI_CLOSURES
+ 	ffi_closure closure;
++#endif
+ 	union _tagITEM *next;
+ } ITEM;
+ 
diff --git a/packages/python/python-cython-native_0.9.6.9.bb b/packages/python/python-cython-native_0.9.6.9.bb
new file mode 100644
index 0000000000..cb7743e1bf
--- /dev/null
+++ b/packages/python/python-cython-native_0.9.6.9.bb
@@ -0,0 +1,9 @@
+require python-cython_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+
+do_stage() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
diff --git a/packages/python/python-cython_0.9.6.9.bb b/packages/python/python-cython_0.9.6.9.bb
new file mode 100644
index 0000000000..a513104108
--- /dev/null
+++ b/packages/python/python-cython_0.9.6.9.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
+It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
+and the messy, low-level world of C."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "cython"
+PR = "ml0"
+
+SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.zip"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-django_0.96.1.bb b/packages/python/python-django_0.96.1.bb
new file mode 100644
index 0000000000..7921f9db0f
--- /dev/null
+++ b/packages/python/python-django_0.96.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Python Web framework"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+RDEPENDS = "python-email python-netserver python-pickle python-pprint \
+	    python-shell python-textutils python-threading python-unixadmin \
+	    python-xml"
+RRECOMMENDS = "python-pysqlite2"
+SRCNAME = "Django"
+
+SRC_URI = "http://media.djangoproject.com/releases/0.96/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+DISTUTILS_INSTALL_ARGS = "--root=${D} --prefix=${prefix}"
diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb
index 73c9f1d0b6..8f4db6382e 100644
--- a/packages/python/python-ecore_cvs.bb
+++ b/packages/python/python-ecore_cvs.bb
@@ -1,5 +1,9 @@
 require python-efl.inc
 DEPENDS += "ecore"
 
-PR = "r1"
+PR = "r2"
+
+do_stage() {
+    distutils_stage_all
+}
 
diff --git a/packages/python/python-efl.bb b/packages/python/python-efl.bb
new file mode 100644
index 0000000000..c667ceff11
--- /dev/null
+++ b/packages/python/python-efl.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+DEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon"
+
+ALLOW_EMPTY = "1"
+
diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc
index aa12b979f8..727c718bd2 100644
--- a/packages/python/python-efl.inc
+++ b/packages/python/python-efl.inc
@@ -2,17 +2,15 @@ DESCRIPTION = "${PN} bindings"
 LICENSE = "BSD"
 AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
 HOMEPAGE = "http://www.enlightenment.org"
-DEPENDS = "python-pyrex-native python-numeric"
+# somewhere is a bug. cython should be self-contained, but somehow this
+# does not compile unless pyrex has been built
+DEPENDS = "python-cython-native python-pyrex-native python-numeric"
 PV = "0.1.1+cvs${SRCDATE}"
 
-inherit distutils
+inherit setuptools
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}"
 S = "${WORKDIR}/${PN}"
 
-do_install_append() {
-	rm ${D}${libdir}/${PYTHON_DIR}/site-packages/site.*
-}
-
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
 
diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb
new file mode 100644
index 0000000000..81ebfcb0c7
--- /dev/null
+++ b/packages/python/python-epsilon_cvs.bb
@@ -0,0 +1,4 @@
+require python-efl.inc
+DEPENDS += "epsilon python-ecore"
+
+PR = "r0"
diff --git a/packages/python/python-pydirectfb/.mtn2git_empty b/packages/python/python-pydirectfb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pydirectfb/.mtn2git_empty
diff --git a/packages/python/python-pydirectfb/fix-directfb-detection.patch b/packages/python/python-pydirectfb/fix-directfb-detection.patch
new file mode 100644
index 0000000000..c8b7cc805a
--- /dev/null
+++ b/packages/python/python-pydirectfb/fix-directfb-detection.patch
@@ -0,0 +1,16 @@
+Index: pydirectfb/setup.py
+===================================================================
+--- pydirectfb.orig/setup.py
++++ pydirectfb/setup.py
+@@ -11,9 +11,10 @@
+     Check dependencies add add the flags to include_dirs, library_dirs and
+     libraries. The basic logic is taken from pygame.
+     """
+-    command = name + '-config --version --cflags --libs 2>/dev/null'
++    command = 'pkg-config %s --modversion --cflags --libs 2>/dev/null' % name
+     try:
+         config = os.popen(command).readlines()
++        print config
+         if len(config) == 0:
+             raise ValueError, 'command not found'
+         flags  = (' '.join(config[1:]) + ' ').split()
diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb
new file mode 100644
index 0000000000..cc0f3cfcd9
--- /dev/null
+++ b/packages/python/python-pydirectfb_cvs.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "DirectFB Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "pydirectfb"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "ml0"
+
+SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \
+           file://fix-directfb-detection.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+	
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 0584d119c9..1af2093556 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,29 +6,46 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml3"
+PR = "ml5"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-EXTRA_OECONF = "--disable-docs"
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+EXTRA_OECONF = "\
+  --disable-docs \
+  --with-python-includes=${STAGING_INCDIR}/../ \
+"
 
 inherit autotools pkgconfig distutils-base
 
 do_configure_prepend() {
-    install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+# dirty fix #1: remove dependency on python-pygobject-dev
+do_install_append() {
+	find ${D} -name "*.la"|xargs rm -f
+	rm -f ${D}/${bindir}/pygtk-codegen-2.0
+	rm -rf ${D}/${libdir}/pkgconfig
 }
 
+# dirty fix #2: fix build system paths leaking in
 require fix-path.inc
 
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+PACKAGES =+ "${PN}-demo"
+FILES_${PN}-demo = "\
+  ${bindir}/pygtk-demo \
+  ${libdir}/pygtk \
+"
+RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang"
+
+# todo: revamp packaging, package demo seperatly
+FILES_${PN}-dev += "\
+  ${libdir}/pygtk/2.0 \
+  ${bindir}/pygtk-* \
+  ${datadir}/pygtk/2.0"
 
 do_stage() {
 	autotools_stage_includes
diff --git a/packages/python/python-pyqt/01_configure.dpatch b/packages/python/python-pyqt/01_configure.dpatch
new file mode 100644
index 0000000000..d7c45b9a44
--- /dev/null
+++ b/packages/python/python-pyqt/01_configure.dpatch
@@ -0,0 +1,288 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_configure.dpatch by Torsten Marek <shlomme@debian.org>
+##
+## DP: Make PyQt4 objectdir-buildable
+
+@DPATCH@
+diff -urNad python-qt4-4.2+snapshot20070727~/configure.py python-qt4-4.2+snapshot20070727/configure.py
+--- python-qt4-4.2+snapshot20070727~/configure.py	2007-07-29 23:58:48.000000000 +0200
++++ python-qt4-4.2+snapshot20070727/configure.py	2007-07-30 00:00:17.000000000 +0200
+@@ -20,6 +20,8 @@
+ # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+ 
++# Modified for Debian by Torsten Marek <shlomme@gmx.net>
++
+ import sys
+ import os
+ import string
+@@ -29,6 +31,23 @@
+ 
+ import sipconfig
+ 
++topsrcdir = os.path.dirname(os.path.abspath(__file__))
++has_objdir = topsrcdir != os.path.abspath(os.path.curdir)
++if not has_objdir:
++    topsrcdir = None
++
++
++def makeDir(dirname):
++    try:
++        os.mkdir(dirname)
++    except OSError, e:
++        if e.errno != 17:
++            raise
++        
++def srcPath(filename):
++    if topsrcdir is not None:
++        return os.path.join(topsrcdir, filename)
++    return filename
+ 
+ # Initialise the globals.
+ pyqt_version = 0x040200
+@@ -134,6 +153,8 @@
+     p.add_option("-g", "--consolidate", action="store_true", default=False,
+             dest="bigqt", help="create a single module which links against "
+             "all the Qt libraries")
++    p.add_option("--disable-designer-plugin", action="store_true", default=False,
++                 help="do not build the Qt Designer plugin")
+ 
+     # These are internal options used to build the mega Windows GPL package.
+     p.add_option("--mwg-openssl", action="callback", default=None,
+@@ -282,6 +303,7 @@
+         check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
+                 extra_libs=["QAxContainer"])
+ 
++        makeDir("dbus")
+         if os.path.isdir("dbus"):
+             check_dbus()
+ 
+@@ -354,7 +376,7 @@
+             generate_code("QtAssistant")
+ 
+         if "QtDesigner" in pyqt_modules:
+-            qpy_dir = os.path.abspath(os.path.join("qpy", "QtDesigner"))
++            qpy_dir = os.path.abspath(srcPath(os.path.join("qpy", "QtDesigner")))
+ 
+             if sys.platform == "win32":
+                 if opts.debug:
+@@ -380,10 +402,10 @@
+ 
+         # Generate the composite module.
+         qtmod_sipdir = os.path.join("sip", "Qt")
+-        mk_clean_dir(qtmod_sipdir)
++        mk_clean_dir(srcPath(qtmod_sipdir))
+ 
+         qtmod_sipfile = os.path.join(qtmod_sipdir, "Qtmod.sip")
+-        f = open(qtmod_sipfile, "w")
++        f = open(srcPath(qtmod_sipfile), "w")
+ 
+         f.write("""%CompositeModule PyQt4.Qt
+ 
+@@ -555,7 +577,7 @@
+         return libs, libdirs
+ 
+     def module_installs(self):
+-        return ["__init__.py", "pyqtconfig.py"]
++        return [srcPath("__init__.py"), "pyqtconfig.py"]
+ 
+     def qpylibs(self):
+         # See which QPy libraries to build.
+@@ -571,8 +593,8 @@
+         for qpy, pro in qpylibs.iteritems():
+             sipconfig.inform("Creating QPy library for %s Makefile..." % qpy)
+ 
+-            os.chdir(os.path.join("qpy", qpy))
+-
++            os.chdir(srcPath(os.path.join("qpy", qpy)))
++            
+             if sipcfg.universal:
+                 upro = "u_" + pro
+ 
+@@ -596,6 +618,8 @@
+ 
+         sipconfig.inform("Creating QPy libraries Makefile...")
+ 
++        makeDir("qpy")
++        os.system("ln -s %s qpy/QtDesigner" % (srcPath("qpy/QtDesigner"),))
+         sipconfig.ParentMakefile(
+             configuration=sipcfg,
+             dir="qpy",
+@@ -617,6 +641,7 @@
+                 install_dir=pydbusmoddir,
+                 qt=["QtCore"],
+                 debug=opts.debug,
++                topsrcdir=topsrcdir,
+                 universal=sipcfg.universal
+             )
+ 
+@@ -625,18 +650,19 @@
+             makefile.generate()
+             tool.append("dbus")
+ 
+-        # Only include ElementTree for older versions of Python.
+-        if sipcfg.py_version < 0x020500:
+-            sipconfig.inform("Creating elementtree Makefile...")
++        # Don't include elementtree on Debian
++##         # Only include ElementTree for older versions of Python.
++##         if sipcfg.py_version < 0x020500:
++##             sipconfig.inform("Creating elementtree Makefile...")
+ 
+-            makefile = sipconfig.PythonModuleMakefile(
+-                configuration=sipcfg,
+-                dstdir=os.path.join(pyqt_modroot, "elementtree"),
+-                dir="elementtree"
+-            )
++##             makefile = sipconfig.PythonModuleMakefile(
++##                 configuration=sipcfg,
++##                 dstdir=os.path.join(pyqt_modroot, "elementtree"),
++##                 dir="elementtree"
++##             )
+ 
+-            makefile.generate()
+-            tool.append("elementtree")
++##             makefile.generate()
++##             tool.append("elementtree")
+ 
+         # Create the pyuic4 wrapper.  Use the GUI version on MacOS (so that
+         # previews work properly and normal console use will work anyway), but
+@@ -644,16 +670,18 @@
+         sipconfig.inform("Creating pyuic4 wrapper...")
+ 
+         uicdir=os.path.join(pyqt_modroot, "uic")
+-        wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
++        makeDir("pyuic")
++        # Wrapper script is not needed on Debian
++        #wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
+ 
+         sipconfig.inform("Creating pyuic4 Makefile...")
+ 
+         makefile = sipconfig.PythonModuleMakefile(
+             configuration=sipcfg,
+             dstdir=uicdir,
+-            srcdir="uic",
++            srcdir=srcPath(os.path.join("pyuic", "uic")),
+             dir="pyuic",
+-            installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
++            #installs=[[os.path.basename(wrapper), opts.pyqtbindir]]
+         )
+ 
+         makefile.generate()
+@@ -661,7 +689,7 @@
+ 
+         if "QtXml" in pyqt_modules:
+             sipconfig.inform("Creating pylupdate4 Makefile...")
+-
++            makeDir("pylupdate")
+             makefile = sipconfig.ProgramMakefile(
+                 configuration=sipcfg,
+                 build_file="pylupdate.sbf",
+@@ -671,14 +699,15 @@
+                 qt=["QtCore", "QtGui", "QtXml"],
+                 debug=opts.debug,
+                 warnings=1,
++                topsrcdir=topsrcdir,
+                 universal=sipcfg.universal
+             )
+-
++            makefile.extra_include_dirs.append(srcPath("pylupdate"))
+             makefile.generate()
+             tool.append("pylupdate")
+ 
+             sipconfig.inform("Creating pyrcc4 Makefile...")
+-
++            makeDir("pyrcc")
+             makefile = sipconfig.ProgramMakefile(
+                 configuration=sipcfg,
+                 build_file="pyrcc.sbf",
+@@ -688,6 +717,7 @@
+                 qt=["QtCore", "QtXml"],
+                 debug=opts.debug,
+                 warnings=1,
++                topsrcdir=topsrcdir,
+                 universal=sipcfg.universal
+             )
+ 
+@@ -697,7 +727,7 @@
+             sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
+ 
+         if "QtDesigner" in pyqt_modules:
+-            enabled = True
++            enabled = not opts.disable_designer_plugin
+ 
+             py_major = sipcfg.py_version >> 16
+             py_minor = (sipcfg.py_version >> 8) & 0x0ff
+@@ -731,7 +761,7 @@
+                 # Run qmake to generate the Makefile.
+                 qmake_args = fix_qmake_args()
+                 cwd = os.getcwd()
+-                os.chdir("designer")
++                os.chdir(srcPath("designer"))
+ 
+                 # Create the qmake project file.
+                 fin = open("python.pro-in")
+@@ -755,7 +785,7 @@
+                 run_command("%s %s" % (opts.qmake, qmake_args))
+                 os.chdir(cwd)
+ 
+-                tool.append("designer")
++                tool.append(srcPath("designer"))
+ 
+         return tool
+ 
+@@ -899,7 +929,6 @@
+     add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs)
+ 
+     exe, build = makefile.build_command(name)
+-
+     # Make sure the executable file doesn't exist.
+     remove_file(exe)
+     run_command(build)
+@@ -1025,7 +1054,7 @@
+         return
+ 
+     # Check the module's main .sip file exists.
+-    if os.access(os.path.join("sip", mname, mname + "mod.sip"), os.F_OK):
++    if os.access(srcPath(os.path.join("sip", mname, mname + "mod.sip")), os.F_OK):
+         sipconfig.inform("Checking to see if the %s module should be built..." % mname)
+ 
+         if check_api(incfile, test, mname, extra_include_dirs=extra_include_dirs, extra_lib_dirs=extra_lib_dirs, extra_libs=extra_libs):
+@@ -1226,10 +1255,14 @@
+     argv.append(buildfile)
+ 
+     argv.append("-I")
+-    argv.append("sip")
++    argv.append(srcPath("sip"))
+ 
+     # SIP assumes POSIX style path separators.
+-    argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
++    if topsrcdir is not None:
++        argv.append(string.join([topsrcdir, "sip", mname, mname + "mod.sip"], "/"))
++    else:
++        argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
++
+ 
+     cmd = string.join(argv)
+ 
+@@ -1251,7 +1284,11 @@
+         sipfiles = []
+ 
+         for s in glob.glob("sip/" + mname + "/*.sip"):
+-            sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
++            if has_objdir:
++                topdir = topsrcdir
++            else:
++                topdir = ".."
++            sipfiles.append(os.path.join(topdir, "sip", mname, os.path.basename(s)))
+ 
+         installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)])
+ 
+@@ -1835,7 +1872,7 @@
+     ).generate()
+ 
+     # Install the configuration module.
+-    create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
++    create_config("pyqtconfig.py", srcPath("pyqtconfig.py.in"), macros)
+ 
+ 
+ ###############################################################################
diff --git a/packages/python/python-pyqt/02_htmllinks.dpatch b/packages/python/python-pyqt/02_htmllinks.dpatch
new file mode 100644
index 0000000000..f65509ae2c
--- /dev/null
+++ b/packages/python/python-pyqt/02_htmllinks.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_htmllinks.dpatch by Torsten Marek <shlomme@debian.org>
+
+## DP: Fix the links in the documentation HTML files.
+
+@DPATCH@
+diff -urNad python-qt4-4.1~/doc/pyqt4ref.html python-qt4-4.1/doc/pyqt4ref.html
+--- python-qt4-4.1~/doc/pyqt4ref.html	2006-11-05 00:51:19.000000000 +0100
++++ python-qt4-4.1/doc/pyqt4ref.html	2006-11-21 23:35:52.000000000 +0100
+@@ -85,7 +85,7 @@
+ <p>This is the reference guide for PyQt 4.1.  PyQt v4 is a set of
+ <a class="reference" href="http://www.python.org">Python</a> bindings for v4 of the Qt application
+ framework from <a class="reference" href="http://www.trolltech.com">Trolltech</a>.</p>
+-<p>There is a separate <a class="reference" href="html/classes.html">PyQt API Reference</a>.</p>
++<p>There is a separate <a class="reference" href="classes.html">PyQt API Reference</a>.</p>
+ <p>Qt is a set of C++ libraries and development tools that includes platform
+ independent abstractions for graphical user interfaces, networking, threads,
+ Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and
diff --git a/packages/python/python-pyqt/03_qreal.dpatch b/packages/python/python-pyqt/03_qreal.dpatch
new file mode 100644
index 0000000000..8f9568656c
--- /dev/null
+++ b/packages/python/python-pyqt/03_qreal.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_qreal.dpatch by Torsten Marek <shlomme@debian.org>
+##
+## DP: On ARM, ARMEL, Mips and Mipsel, qreal is a float, not a double.
+
+@DPATCH@
+diff -urNad python-qt4-4.3~/sip/QtCore/qglobal.sip python-qt4-4.3/sip/QtCore/qglobal.sip
+--- python-qt4-4.3~/sip/QtCore/qglobal.sip	2007-08-07 21:52:15.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qglobal.sip	2007-08-07 22:10:14.000000000 +0200
+@@ -46,7 +46,7 @@
+ typedef unsigned long long quint64;
+ typedef qint64 qlonglong;
+ typedef quint64 qulonglong;
+-typedef double qreal;
++typedef float qreal;
+ typedef unsigned char uchar;
+ typedef unsigned short ushort;
+ typedef unsigned int uint;
diff --git a/packages/python/python-pyqt/04_qreal_api_fixes.dpatch b/packages/python/python-pyqt/04_qreal_api_fixes.dpatch
new file mode 100644
index 0000000000..abd9e3f4cd
--- /dev/null
+++ b/packages/python/python-pyqt/04_qreal_api_fixes.dpatch
@@ -0,0 +1,259 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_qreal_api_fixes.dpatch by Torsten Marek <shlomme@debian.org>
+##
+## DP: Exchanges double by qreal in some wrapped methods.
+
+@DPATCH@
+diff -urNad python-qt4-4.3~/sip/QtCore/qlist.sip python-qt4-4.3/sip/QtCore/qlist.sip
+--- python-qt4-4.3~/sip/QtCore/qlist.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qlist.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -322,8 +322,8 @@
+ %End
+ };
+ %If (Qt_4_3_0 -)
+-// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
+-%MappedType QList<QPair<double, double> >
++// QList<QPair<float, float> > is implemented as a Python list of 2-element tuples.
++%MappedType QList<QPair<float, float> >
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -340,7 +340,7 @@
+     // Set the list elements.
+     for (int i = 0; i < sipCpp->size(); ++i)
+     {
+-        const QPair<double, double> &p = sipCpp->at(i);
++        const QPair<float, float> &p = sipCpp->at(i);
+         PyObject *pobj;
+ 
+         if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
+@@ -370,16 +370,16 @@
+         return 1;
+     }
+ 
+-    QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
++    QList<QPair<float, float> > *ql = new QList<QPair<float, float> >;
+  
+     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+     {
+         PyObject *tup = PyList_GET_ITEM(sipPy, i);
+ 
+-        double first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+-        double second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1));
++        float first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
++        float second = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 1));
+  
+-        ql->append(QPair<double, double>(first, second));
++        ql->append(QPair<float, float>(first, second));
+     }
+  
+     *sipCppPtr = ql;
+@@ -389,9 +389,9 @@
+ };
+ %End
+ %If (Qt_4_3_0 -)
+-// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
+-template<double, TYPE>
+-%MappedType QList<QPair<double, TYPE> >
++// QList<QPair<float, TYPE> > is implemented as a Python list of 2-element tuples.
++template<float, TYPE>
++%MappedType QList<QPair<float, TYPE> >
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -408,7 +408,7 @@
+     // Set the list elements.
+     for (int i = 0; i < sipCpp->size(); ++i)
+     {
+-        const QPair<double, TYPE> &p = sipCpp->at(i);
++        const QPair<float, TYPE> &p = sipCpp->at(i);
+         TYPE *t = new TYPE(p.second);
+         PyObject *pobj;
+ 
+@@ -447,12 +447,12 @@
+         return 1;
+     }
+ 
+-    QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
++    QList<QPair<float, TYPE> > *ql = new QList<QPair<float, TYPE> >;
+  
+     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+     {
+         PyObject *tup = PyList_GET_ITEM(sipPy, i);
+-        double d;
++        float d;
+         int state;
+ 
+         d = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+@@ -466,7 +466,7 @@
+             return 0;
+         }
+ 
+-        ql->append(QPair<double, TYPE>(d, *t));
++        ql->append(QPair<float, TYPE>(d, *t));
+ 
+         sipReleaseInstance(t, sipClass_TYPE, state);
+     }
+@@ -524,8 +524,8 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
+-// QList<double> is implemented as a Python list of floats.
+-%MappedType QList<double>
++// QList<float> is implemented as a Python list of floats.
++%MappedType QList<float>
+ {
+ %TypeHeaderCode
+ #include <qlist.h>
+@@ -561,7 +561,7 @@
+     if (sipIsErr == NULL)
+         return PyList_Check(sipPy);
+ 
+-    QList<double> *ql = new QList<double>;
++    QList<float> *ql = new QList<float>;
+  
+     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+         ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i)));
+diff -urNad python-qt4-4.3~/sip/QtCore/qvector.sip python-qt4-4.3/sip/QtCore/qvector.sip
+--- python-qt4-4.3~/sip/QtCore/qvector.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtCore/qvector.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -143,8 +143,8 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
+-// QVector<double> is implemented as a Python list of floats.
+-%MappedType QVector<double>
++// QVector<float> is implemented as a Python list of floats.
++%MappedType QVector<float>
+ {
+ %TypeHeaderCode
+ #include <qvector.h>
+@@ -180,7 +180,7 @@
+     if (sipIsErr == NULL)
+         return PyList_Check(sipPy);
+ 
+-    QVector<double> *ql = new QVector<double>;
++    QVector<float> *ql = new QVector<float>;
+  
+     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+         ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i)));
+@@ -190,9 +190,9 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
+-// QVector<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
++// QVector<QPair<float, TYPE> > is implemented as a Python list of 2-element tuples.
+ template<TYPE>
+-%MappedType QVector<QPair<double, TYPE> >
++%MappedType QVector<QPair<float, TYPE> >
+ {
+ %TypeHeaderCode
+ #include <qvector.h>
+@@ -209,7 +209,7 @@
+     // Set the list elements.
+     for (int i = 0; i < sipCpp->size(); ++i)
+     {
+-        const QPair<double, TYPE> &p = sipCpp->at(i);
++        const QPair<float, TYPE> &p = sipCpp->at(i);
+         TYPE *pt = new TYPE(p.second);
+         PyObject *pobj;
+ 
+@@ -248,14 +248,14 @@
+         return 1;
+     }
+ 
+-    QVector<QPair<double, TYPE> > *qv = new QVector<QPair<double, TYPE> >;
++    QVector<QPair<float, TYPE> > *qv = new QVector<QPair<float, TYPE> >;
+  
+     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+     {
+         PyObject *tup = PyList_GET_ITEM(sipPy, i);
+         int state;
+         TYPE *s;
+-        QPair<double, TYPE> p;
++        QPair<float, TYPE> p;
+ 
+         p.first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0));
+ 
+diff -urNad python-qt4-4.3~/sip/QtGui/qbrush.sip python-qt4-4.3/sip/QtGui/qbrush.sip
+--- python-qt4-4.3~/sip/QtGui/qbrush.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qbrush.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -138,7 +138,7 @@
+ 
+ QDataStream &operator>>(QDataStream &, QBrush & /Constrained/);
+ QDataStream &operator<<(QDataStream &, const QBrush & /Constrained/);
+-typedef QVector<QPair<double, QColor> > QGradientStops;
++typedef QVector<QPair<float, QColor> > QGradientStops;
+ 
+ class QGradient
+ {
+diff -urNad python-qt4-4.3~/sip/QtGui/qgraphicsitemanimation.sip python-qt4-4.3/sip/QtGui/qgraphicsitemanimation.sip
+--- python-qt4-4.3~/sip/QtGui/qgraphicsitemanimation.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qgraphicsitemanimation.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -64,19 +64,19 @@
+ 
+ public:
+ %If (Qt_4_3_0 -)
+-    QList<QPair<double, QPointF> > posList() const;
++    QList<QPair<float, QPointF> > posList() const;
+ %End
+ %If (Qt_4_3_0 -)
+-    QList<QPair<double, double> > rotationList() const;
++    QList<QPair<float, float> > rotationList() const;
+ %End
+ %If (Qt_4_3_0 -)
+-    QList<QPair<double, QPointF> > translationList() const;
++    QList<QPair<float, QPointF> > translationList() const;
+ %End
+ %If (Qt_4_3_0 -)
+-    QList<QPair<double, QPointF> > scaleList() const;
++    QList<QPair<float, QPointF> > scaleList() const;
+ %End
+ %If (Qt_4_3_0 -)
+-    QList<QPair<double, QPointF> > shearList() const;
++    QList<QPair<float, QPointF> > shearList() const;
+ %End
+ 
+ private:
+diff -urNad python-qt4-4.3~/sip/QtGui/qpainterpath.sip python-qt4-4.3/sip/QtGui/qpainterpath.sip
+--- python-qt4-4.3~/sip/QtGui/qpainterpath.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qpainterpath.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -194,8 +194,8 @@
+     void setCurveThreshold(qreal threshold);
+     qreal curveThreshold() const;
+     void setDashPattern(Qt::PenStyle);
+-    void setDashPattern(const QVector<double> &dashPattern);
+-    QVector<double> dashPattern() const;
++    void setDashPattern(const QVector<float> &dashPattern);
++    QVector<float> dashPattern() const;
+     QPainterPath createStroke(const QPainterPath &path) const;
+ %If (Qt_4_3_0 -)
+     void setDashOffset(qreal offset);
+diff -urNad python-qt4-4.3~/sip/QtGui/qpen.sip python-qt4-4.3/sip/QtGui/qpen.sip
+--- python-qt4-4.3~/sip/QtGui/qpen.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qpen.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -91,8 +91,8 @@
+     void setCapStyle(Qt::PenCapStyle pcs);
+     Qt::PenJoinStyle joinStyle() const;
+     void setJoinStyle(Qt::PenJoinStyle pcs);
+-    QVector<double> dashPattern() const;
+-    void setDashPattern(const QVector<double> &pattern);
++    QVector<float> dashPattern() const;
++    void setDashPattern(const QVector<float> &pattern);
+     qreal miterLimit() const;
+     void setMiterLimit(qreal limit);
+     bool operator==(const QPen &p) const;
+diff -urNad python-qt4-4.3~/sip/QtGui/qtextoption.sip python-qt4-4.3/sip/QtGui/qtextoption.sip
+--- python-qt4-4.3~/sip/QtGui/qtextoption.sip	2007-09-02 00:35:50.000000000 +0200
++++ python-qt4-4.3/sip/QtGui/qtextoption.sip	2007-09-02 00:35:53.000000000 +0200
+@@ -62,8 +62,8 @@
+     typedef QFlags<QTextOption::Flag> Flags;
+     QFlags<QTextOption::Flag> flags() const;
+     qreal tabStop() const;
+-    void setTabArray(QList<double> tabStops);
+-    QList<double> tabArray() const;
++    void setTabArray(QList<float> tabStops);
++    QList<float> tabArray() const;
+     void setUseDesignMetrics(bool b);
+     bool useDesignMetrics() const;
+     void setAlignment(Qt::Alignment aalignment);
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
new file mode 100644
index 0000000000..74a16c4720
--- /dev/null
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "Python Qt4 Bindings"
+HOMEPAGE = "http://riverbankcomputing.co.uk"
+AUTHOR = "Phil Thomson @ riverbank.co.uk"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python-core"
+SRCNAME = "pyqt"
+PR = "ml0"
+
+SRC_URI = "\
+  http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
+  file://cross-compile.patch;patch=1 \
+  file://01_configure.dpatch;patch=1 \
+  file://02_htmllinks.dpatch;patch=1 \
+  file://03_qreal.dpatch;patch=1 \
+  file://04_qreal_api_fixes.dpatch;patch=1"
+S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
+
+inherit qt4x11 sip distutils-base
+
+PARALLEL_MAKE = ""
+
+QMAKE_PROFILES = "pyqt.pro"
+# NOTE: match with qt version we have in OE
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+EXTRA_OEMAKE = " MAKEFLAGS= "
+
+SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
+# SIP_MODULES += "QtAssistant"
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
+                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
+                         DEFINES+=QT_NO_FPU"
+
+FIX_QREAL = "\
+  QtCore/qtimeline.sip \
+  QtCore/qrect.sip \
+  QtGui/qtransform.sip \
+"
+
+do_generate_prepend() {
+	for i in ${FIX_QREAL}; do
+		sed -i -e s,qreal,float,g sip/$i
+	done
+}
+
+do_configure_prepend() {
+    echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro
+}
+
+do_stage() {
+    install -d ${STAGING_SIPDIR}/qt/
+    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
+    for module in ${SIP_MODULES}
+    do
+        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
+	install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
+    done
+}
+
+do_install() {
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
+    for module in ${SIP_MODULES}
+    do
+		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
+		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
+    done
+	cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/python/python-pyqt_4.3.bb b/packages/python/python-pyqt_4.3.bb
deleted file mode 100644
index c867598b4f..0000000000
--- a/packages/python/python-pyqt_4.3.bb
+++ /dev/null
@@ -1,84 +0,0 @@
-DESCRIPTION = "Python Qt4 Bindings"
-HOMEPAGE = "http://riverbankcomputing.co.uk"
-AUTHOR = "Phil Thomson @ riverbank.co.uk"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-RDEPENDS = "python-core"
-SRCNAME = "pyqt"
-PR = "ml0"
-
-SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \
-           file://cross-compile.patch;patch=1"
-
-BROKEN = "1"
-# Something really fishy wrt. to arm/mips/etc. double vs. qreal. May even be a problem in Qt headers itself.
-# Symptons:
-#| sipQtCoreQTimeLine.cpp:136: error: conflicting return type specified for 'virtual double sipQTimeLine::valueForTime(int) const'
-#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qtimeline.h:92: error:   overriding 'virtual qreal QTimeLine::valueForTime(int) const'
-# And:
-#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getRect(PyObject*, PyObject*)':
-#| sipQtCoreQRectF.cpp:1182: error: no matching function for call to 'QRectF::getRect(double*, double*, double*, double*)'
-#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:725: note: candidates are: void QRectF::getRect(qreal*, qreal*, qreal*, qreal*) const
-#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getCoords(PyObject*, PyObject*)':
-#| sipQtCoreQRectF.cpp:1237: error: no matching function for call to 'QRectF::getCoords(double*, double*, double*, double*)'
-#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:741: note: candidates are: void QRectF::getCoords(qreal*, qreal*, qreal*, qreal*) const
-#| make[1]: *** [sipQtCoreQRectF.o] Error 1
-
-S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
-
-inherit qmake qt4x11 sip distutils-base
-
-PARALLEL_MAKE = ""
-
-QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
-EXTRA_OEMAKE = " MAKEFLAGS= "
-
-SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
-# SIP_MODULES += "QtAssistant"
-EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
-                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR}"
-
-#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \
-#                         QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \
-#                         QMAKE_RPATH=-Wl,-rpath-link, \
-#                         DESTDIR= \
-#                         VERSION=1.0.0 \
-#                         DEFINES+=SIP_MAKE_DLL \
-#                         DEFINES+=SIP_QT_SUPPORT \
-#                         INCLUDEPATH+=. \
-#                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
-#                         INCLUDEPATH+=${STAGING_INCDIR} \
-#                         LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages"
-
-do_configure_prepend() {
-    echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro
-}
-
-#do_configure() {
-#    echo "yes" | python configure.py -w -q ${OE_QMAKE_QMAKE}
-#}
-
-do_stage() {
-    install -d ${STAGING_SIPDIR}/qt/
-    install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages
-    for module in ${SIP_MODULES}
-    do
-        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
-	install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
-    done
-}
-
-do_install() {
-    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4
-    for module in ${SIP_MODULES}
-    do
-		echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
-		install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
-    done
-	cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
-	cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
-}
-
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/python/python-pysqlite2/.mtn2git_empty b/packages/python/python-pysqlite2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pysqlite2/.mtn2git_empty
diff --git a/packages/python/python-pysqlite2/fix-setup.patch b/packages/python/python-pysqlite2/fix-setup.patch
new file mode 100644
index 0000000000..fb732a1c3d
--- /dev/null
+++ b/packages/python/python-pysqlite2/fix-setup.patch
@@ -0,0 +1,9 @@
+diff -urN pysqlite-2.4.0.orig/setup.cfg pysqlite-2.4.0/setup.cfg
+--- pysqlite-2.4.0.orig/setup.cfg	2007-11-25 17:56:17.000000000 +0100
++++ pysqlite-2.4.0/setup.cfg	2007-12-07 09:59:36.000000000 +0100
+@@ -1,5 +1,3 @@
+ [build_ext]
+ define=
+-include_dirs=/usr/include
+-library_dirs=/usr/lib
+ libraries=sqlite3
diff --git a/packages/python/python-pysqlite2_2.4.0.bb b/packages/python/python-pysqlite2_2.4.0.bb
new file mode 100644
index 0000000000..751122e10e
--- /dev/null
+++ b/packages/python/python-pysqlite2_2.4.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Python interface to SQLite 3"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+DEPENDS = "sqlite3"
+SRCNAME = "pysqlite"
+
+SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
+	   file://fix-setup.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_append() {
+    install -d ${D}${datadir}/doc/
+    mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
+}
diff --git a/packages/python/python-sip_4.7.bb b/packages/python/python-sip_4.7.3.bb
index 61fcc32986..fc87b01e53 100644
--- a/packages/python/python-sip_4.7.bb
+++ b/packages/python/python-sip_4.7.3.bb
@@ -1,5 +1,3 @@
-BROKEN = "1"
-
 DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
@@ -12,7 +10,7 @@ PR = "ml0"
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"
 
-inherit qmake qt4x11 distutils-base
+inherit qt4x11 distutils-base
 
 EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
                          CONFIG=console \
diff --git a/packages/python/python-sword_1.5.9.bb b/packages/python/python-sword_1.5.10.bb
index a18cf89466..a18cf89466 100644
--- a/packages/python/python-sword_1.5.9.bb
+++ b/packages/python/python-sword_1.5.10.bb
diff --git a/packages/python/python-sword_1.5.8.bb b/packages/python/python-sword_1.5.8.bb
deleted file mode 100644
index b8e319c693..0000000000
--- a/packages/python/python-sword_1.5.8.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Python bindings for the sword library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-RDEPENDS = "python-core sword"
-DEPENDS = "sword-${PV} swig-native"
-SRCNAME = "sword"
-PR = "r0"
-
-SRC_URI = "http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}/bindings/swig/package"
-
-EXTRA_OECONF = "--with-sword-dir=${STAGING_DIR}/${HOST_SYS}"
-
-inherit distutils autotools
-
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
-	./autogen.sh
-}
-
-do_compile() {
-        oe_runmake BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} pythonswig python_make
-}
-
-do_install() {
-	cd ${S}/python
-	distutils_do_install
-}
diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb
index 3ac2f7d390..8ad4e797c0 100644
--- a/packages/python/python_2.5.1.bb
+++ b/packages/python/python_2.5.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 
 # NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml2"
+PR = "ml5"
 
 PYTHON_MAJMIN = "2.5"
 
@@ -17,6 +17,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
            file://fix-tkinter-detection.patch;patch=1 \
            file://autohell.patch;patch=1 \
            file://sitebranding.patch;patch=1 \
+           file://enable-ctypes-module.patch;patch=1 \
            file://default-is-optimized.patch;patch=1"
 S = "${WORKDIR}/Python-${PV}"
 
diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb
index 84df0ef732..d9071193a9 100644
--- a/packages/qmake/qmake2-native_2.10a.bb
+++ b/packages/qmake/qmake2-native_2.10a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 QTVER = "qtopia-core-opensource-src-4.3.2"
 
@@ -15,7 +15,7 @@ S = "${WORKDIR}/${QTVER}"
 
 # we need the real target system here
 CROSS_SYS := "${TARGET_SYS}"
-inherit autotools native
+inherit autotools cross 
 
 export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb
index 91ac3f68cf..77fa6dba12 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt/qt4-x11-free_4.1.2.bb
@@ -70,6 +70,7 @@ PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml"
 
 do_stage() {
 	oe_runmake install INSTALL_ROOT=/
+	install -d ${STAGING_QT_DIR}
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb
index a097c4e9ca..2fa53a4d54 100644
--- a/packages/qt/qt4-x11-free_4.3.2.bb
+++ b/packages/qt/qt4-x11-free_4.3.2.bb
@@ -74,6 +74,7 @@ PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Netw
 
 do_stage() {
 	oe_runmake install INSTALL_ROOT=/
+	install -d ${STAGING_QT_DIR}
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
diff --git a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
index 6a5c01f0fd..fe047aed37 100644
--- a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
+++ b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
@@ -4,7 +4,9 @@ LICENSE = "GPL"
 RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs"
 PR = "r1"
 
-SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+#Namesys.com seems to be in trouble.  See bug #3482 for more information
+#SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+SRC_URI ="${DEBIAN_MIRROR}/main/r/reiserfsprogs/reiserfsprogs_${PV}.orig.tar.gz \
 	  file://header-fix.patch;patch=1 \
 	  "
 
diff --git a/packages/roadmap/files/qt/.mtn2git_empty b/packages/roadmap/files/qt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/roadmap/files/qt/.mtn2git_empty
diff --git a/packages/roadmap/files/qt/qt2-fixes.patch b/packages/roadmap/files/qt/qt2-fixes.patch
new file mode 100644
index 0000000000..63c1c96e53
--- /dev/null
+++ b/packages/roadmap/files/qt/qt2-fixes.patch
@@ -0,0 +1,10 @@
+--- src/qt/Makefile~qt2-fixes.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+ 
+ ifeq ($(DESKTOP),QPE)
+    CFLAGS += -I$(QTDIR)/include -DQWS
+-   LIBS += -lqte -lqpe
++   LIBS += -lqpe
+    INSTALLDIR=$(QTDIR)
+ endif
diff --git a/packages/roadmap/files/qt/qt_canvas.patch b/packages/roadmap/files/qt/qt_canvas.patch
new file mode 100644
index 0000000000..13c775c8cb
--- /dev/null
+++ b/packages/roadmap/files/qt/qt_canvas.patch
@@ -0,0 +1,20 @@
+--- src/qt/qt_canvas.cc.old	2007-12-08 20:29:52.000000000 -0600
++++ src/qt/qt_canvas.cc	2007-12-13 02:34:22.000000000 -0600
+@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch
+    *w = r.width();
+    *ascent = fm.ascent();
+    *descent = fm.descent();
+-#ifdef QT_NO_ROTATE
++#ifdef QT_NO_TRANSFORMATIONS
+    if (can_tilt) *can_tilt = 0;
+ #else
+    if (can_tilt) *can_tilt = 1;
+@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo
+ 
+ void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position,
+       int center, const char* text, int angle) {
+-#ifndef QT_NO_ROTATE
++#ifndef QT_NO_TRANSFORMATIONS
+    if (!pixmap) {
+       return;
+    }
diff --git a/packages/roadmap/files/qt/qt_main.patch b/packages/roadmap/files/qt/qt_main.patch
new file mode 100644
index 0000000000..2f81128b34
--- /dev/null
+++ b/packages/roadmap/files/qt/qt_main.patch
@@ -0,0 +1,61 @@
+--- src/qt/qt_main.cc.old	2007-12-08 20:32:34.000000000 -0600
++++ src/qt/qt_main.cc	2007-12-08 20:34:38.000000000 -0600
+@@ -27,6 +27,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <unistd.h>
+ #include "qt_main.h"
+ 
+ static int signalFd[2];
+@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char*
+                              const char* tip,
+                              RoadMapCallback callback) {
+ 
+-#ifndef QWS
+-   // For some unknown reason, this toolbar crashes RoadMap
+-   // on the Sharp Zaurus.
+-   // This should be fixed and the ifndef removed.
+-   // Pascal: I believe this has been fixed now.
+-
+    if (toolBar == 0) {
+       addToolbar("");
+    }
+@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char*
+ 
+       connect(b, SIGNAL(clicked()), cb, SLOT(fire()));
+    }
+-#endif
+ }  
+ 
+ void RMapMainWindow::addToolSpace(void) {
+ 
+-#ifndef QWS
+-   // For some unknown reason, this toolbar crashes RoadMap
+-   // on the Sharp Zaurus. This should be fixed and the ifndef
+-   // removed.
+-
+    addTool (NULL, NULL, NULL, NULL);
+ 
+    toolBar->addSeparator();
+-#endif
+ }
+ 
+ 
+@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv
+ 
+ void RMapMainWindow::signalHandler(int sig)
+ {
+-  ::write(signalFd[0], &sig, sizeof(sig));
++  write(signalFd[0], &sig, sizeof(sig));
+ }
+ 
+ void RMapMainWindow::handleSignal()
+ {
+   snSignal->setEnabled(false);
+   int tmp;
+-  ::read(signalFd[1], &tmp, sizeof(tmp));
++  read(signalFd[1], &tmp, sizeof(tmp));
+   QString action;
+   switch (tmp) {
+     case SIGTERM: action="SIGTERM"; break;
diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/qt/roadmap.desktop.patch
new file mode 100644
index 0000000000..98d5b06130
--- /dev/null
+++ b/packages/roadmap/files/qt/roadmap.desktop.patch
@@ -0,0 +1,16 @@
+--- src/roadmap.desktop.old	2007-12-08 23:15:45.000000000 -0600
++++ src/roadmap.desktop	2007-12-08 23:17:48.000000000 -0600
+@@ -1,11 +1,8 @@
+ [Desktop Entry]
+-Comment=RoadMap
+ Comment=Car Navigation System
+ Exec=roadmap
+-Icon=roadmap.png
++Icon=roadmap
+ Type=Application
+ Name=RoadMap
+ GenericName=Map Viewer
+-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK;
+-FilePattern=*roadmap;*.rdm
+-
++Categories=VectorGraphics;Graphics;Viewer;GTK;
diff --git a/packages/roadmap/files/qt/roadmap_main.patch b/packages/roadmap/files/qt/roadmap_main.patch
new file mode 100644
index 0000000000..7b16ce28fc
--- /dev/null
+++ b/packages/roadmap/files/qt/roadmap_main.patch
@@ -0,0 +1,16 @@
+--- src/qt/roadmap_main.cc.old	2007-12-08 15:47:05.000000000 -0600
++++ src/qt/roadmap_main.cc	2007-12-07 20:39:15.000000000 -0600
+@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur
+          break;
+ 
+       case ROADMAP_CURSOR_WAIT:
+-         mainWindow->setCursor (QCursor(Qt::WaitCursor));
++         mainWindow->setCursor (QCursor(Qt::waitCursor));
+          break;
+ 
+       case ROADMAP_CURSOR_CROSS:
+-         mainWindow->setCursor (QCursor(Qt::CrossCursor));
++         mainWindow->setCursor (QCursor(Qt::crossCursor));
+          break;
+       }
+    }
diff --git a/packages/zroadmap/files/zroadgps.png b/packages/roadmap/files/zroadgps.png
index a77b3729b7..a77b3729b7 100644
--- a/packages/zroadmap/files/zroadgps.png
+++ b/packages/roadmap/files/zroadgps.png
diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb
index cb81a44ae8..557c4a1096 100644
--- a/packages/roadmap/roadmap-gtk2_cvs.bb
+++ b/packages/roadmap/roadmap-gtk2_cvs.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat gtk+"
-LICENSE = "GPL"
+require roadmap.inc
+
+DEPENDS = "expat gtk+"
 PV = "1.0.12+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
@@ -16,7 +11,6 @@ SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
 
 S = "${WORKDIR}/roadmap/src"
 
-PARALLEL_MAKE = ""
 CFLAGS += " -I${S} "
 
 
@@ -39,6 +33,5 @@ do_install() {
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
 
-
 FILES_${PN} += "${datadir}/roadmap"
 
diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc
new file mode 100644
index 0000000000..43577badb9
--- /dev/null
+++ b/packages/roadmap/roadmap.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." 
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+LICENSE = "GPL"
+
+PARALLEL_MAKE = ""
diff --git a/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/roadmap/zroadmap-1.0.12/.mtn2git_empty
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
index 24fe1c9bdb..24fe1c9bdb 100644
--- a/packages/zroadmap/files/qt2-fixes-r1.patch
+++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
diff --git a/packages/zroadmap/files/qt2-fixes.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
index 46b17b8cfb..46b17b8cfb 100644
--- a/packages/zroadmap/files/qt2-fixes.patch
+++ b/packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc
new file mode 100644
index 0000000000..acee708837
--- /dev/null
+++ b/packages/roadmap/zroadmap.inc
@@ -0,0 +1,13 @@
+require roadmap.inc
+
+SECTION = "opie/applications"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+do_configure() {
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb
new file mode 100644
index 0000000000..9a7b73d1a1
--- /dev/null
+++ b/packages/roadmap/zroadmap_1.0.12.bb
@@ -0,0 +1,33 @@
+require zroadmap.inc
+
+PR = "r1"
+
+SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
+           file://qt2-fixes.patch;pnum=2;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
+                GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
+                GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
+	cd qt && oe_runmake
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+        install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb
new file mode 100644
index 0000000000..42184ce62b
--- /dev/null
+++ b/packages/roadmap/zroadmap_1.1.0.bb
@@ -0,0 +1,40 @@
+require zroadmap.inc
+
+DEPENDS += "expat"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
+           file://cross.patch;patch=1;pnum=2 \
+           file://qt/qt2-fixes.patch;patch=1 \
+           file://qt/qt_canvas.patch;patch=1 \
+           file://qt/qt_main.patch;patch=1 \
+           file://qt/roadmap_main.patch;patch=1 \
+           file://qt/roadmap.desktop.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \
+                CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+	oe_runmake -C gpx libgpx.a
+	oe_runmake -C unix libosroadmap.a
+	oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb
new file mode 100644
index 0000000000..5b39faf071
--- /dev/null
+++ b/packages/roadmap/zroadmap_cvs.bb
@@ -0,0 +1,42 @@
+require zroadmap.inc
+
+DEPENDS += "expat"
+SRCDATE = "20071212"
+PV = "1.1.0+cvs-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+           file://cross.patch;patch=1;pnum=2 \
+           file://qt/qt2-fixes.patch;patch=1 \
+           file://qt/qt_canvas.patch;patch=1 \
+#upstream  file://qt/qt_main.patch;patch=1 \
+           file://qt/roadmap_main.patch;patch=1 \
+#upstream  file://qt/roadmap.desktop.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap/src"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
+                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+	oe_runmake -C gpx libgpx.a
+	oe_runmake -C unix libosroadmap.a
+	oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}
diff --git a/packages/shasum/shasum-native.bb b/packages/shasum/shasum-native.bb
index 2b9dd9a09d..a28d5ac967 100644
--- a/packages/shasum/shasum-native.bb
+++ b/packages/shasum/shasum-native.bb
@@ -6,6 +6,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 PATCHTOOL = "patch"
 
 do_fetch[depends] = ""
-do_populate_staging() {
+do_stage() {
+    install -d ${STAGING_BINDIR}
     install ${S}/oe_sha256sum ${STAGING_BINDIR}
 }
diff --git a/packages/sip/sip-native_4.7.bb b/packages/sip/sip-native_4.7.3.bb
index 08cdae4ead..b47a3a7539 100644
--- a/packages/sip/sip-native_4.7.bb
+++ b/packages/sip/sip-native_4.7.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/sipgen"
 
-inherit qmake qt4x11 native
+inherit qt4x11 native
 
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
 
@@ -17,7 +17,7 @@ do_configure_prepend() {
 }
 
 do_stage() {
-	install -m 0755 sip ${STAGING_BINDIR}/sip4
+	install -m 0755 sip ${STAGING_BINDIR_NATIVE}/sip
 	cd ${WORKDIR}/sip-${PV} && python configure.py
 	install -d ${STAGING_PYDIR}/site-packages
 	install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages
diff --git a/packages/sofia-sip/sofia-sip.inc b/packages/sofia-sip/sofia-sip.inc
new file mode 100644
index 0000000000..f2bc57688f
--- /dev/null
+++ b/packages/sofia-sip/sofia-sip.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
+HOMEPAGE = "http://sofia-sip.sourceforge.net/"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 openssl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+PACKAGES += " ${PN}-bin ${PN}-glib"
+
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN} = "${libdir}/libsofia-sip-ua.so.*"
+FILES_${PN}-dev += "${datadir}/sofia-sip/*.awk"
+FILES_${PN}-glib = "${libdir}/libsofia-sip-ua-glib.so.*" 
+
+LEAD_SONAME = "libsofia-sip-ua.so"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/sofia-sip/sofia-sip_1.11.7.bb b/packages/sofia-sip/sofia-sip_1.11.7.bb
index 50f4e1d617..accc58784f 100644
--- a/packages/sofia-sip/sofia-sip_1.11.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.11.7.bb
@@ -1,13 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-autotools_stage_all
-}
-
+require sofia-sip.inc
 
+PR = "r2"
diff --git a/packages/sofia-sip/sofia-sip_1.12.7.bb b/packages/sofia-sip/sofia-sip_1.12.7.bb
new file mode 100644
index 0000000000..4c3eff14df
--- /dev/null
+++ b/packages/sofia-sip/sofia-sip_1.12.7.bb
@@ -0,0 +1,3 @@
+require sofia-sip.inc
+
+PR = "r1"
diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb
index 26702f998b..97a1428398 100644
--- a/packages/spandsp/spandsp_0.0.3.bb
+++ b/packages/spandsp/spandsp_0.0.3.bb
@@ -1,13 +1,11 @@
 DESCRIPTION = "A library of many DSP functions for telephony."
 HOMEPAGE = "http://www.soft-switch.org"
-DEPENDS = "tiff libxml2"
 SECTION = "voip"
 LICENSE = "GPL"
-PV = "0.0.3"
-PSUBV = "pre27"
-PR = "r0"
+DEPENDS = "tiff libxml2"
+PR = "r1"
 
-SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz"
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
 inherit autotools
 
diff --git a/packages/stage-manager/files/stage-manager b/packages/stage-manager/files/stage-manager
index c5b6d17a56..35453992f4 100755
--- a/packages/stage-manager/files/stage-manager
+++ b/packages/stage-manager/files/stage-manager
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2006 Richard Purdie
+# Copyright (C) 2006-2007 Richard Purdie
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License version 2 as published by the Free
@@ -79,33 +79,54 @@ if __name__ == "__main__":
 
     found = False
 
+    def updateCache(path, fstamp):
+        cache[path] = {}
+        cache[path]['ts'] = fstamp[stat.ST_MTIME]
+        cache[path]['size'] = fstamp[stat.ST_SIZE]
+        found = True
+
+    def copyfile(path):
+        if options.copydir:
+            copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1))
+            mkdirhier(os.path.split(copypath)[0])
+            os.system("cp -dp " + path + " " + copypath)
+
+    def copydir(path, fstamp):
+        if options.copydir:
+            copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1))
+            if os.path.islink(path):
+                os.symlink(os.readlink(path), copypath)
+            else:
+                mkdirhier(copypath)
+            os.utime(copypath, (fstamp[stat.ST_ATIME], fstamp[stat.ST_MTIME]))
+
     for root, dirs, files in os.walk(options.parentdir):
         for f in files:
             path = os.path.join(root, f)
             if not os.access(path, os.R_OK):
                 continue
-            fstamp = os.stat(path)
+            fstamp = os.lstat(path)
             if path not in cache:
                 print "new file %s" % path
-                cache[path] = {}
-                cache[path]['ts'] = fstamp[stat.ST_MTIME]
-                cache[path]['size'] = fstamp[stat.ST_SIZE]
-                if options.copydir:
-                    copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1))
-                    mkdirhier(os.path.split(copypath)[0])
-                    os.system("mv " + path + " " + copypath)
-                    found = True
+		updateCache(path, fstamp)
+                copyfile(path)
             else:
                 if cache[path]['ts'] != fstamp[stat.ST_MTIME] or cache[path]['size'] != fstamp[stat.ST_SIZE]:
                     print "file %s changed" % path
-                    cache[path] = {}
-                    cache[path]['ts'] = fstamp[stat.ST_MTIME]
-                    cache[path]['size'] = fstamp[stat.ST_SIZE]
-		    if options.copydir:
-                        copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1))
-                        mkdirhier(os.path.split(copypath)[0])
-                        os.system("mv " + path + " " + copypath)
-                        found = True
+                    updateCache(path, fstamp)
+                    copyfile(path)
+        for d in dirs:
+            path = os.path.join(root, d)
+            fstamp = os.lstat(path)
+            if path not in cache:
+                print "new dir %s" % path
+		updateCache(path, fstamp)
+                copydir(path, fstamp)
+            else:
+                if cache[path]['ts'] != fstamp[stat.ST_MTIME]:
+                    print "dir %s changed" % path
+                    updateCache(path, fstamp)
+                    copydir(path, fstamp)
 
     if options.update:
         print "Updating"
diff --git a/packages/stage-manager/stagemanager-native_0.0.1.bb b/packages/stage-manager/stagemanager-native_0.0.1.bb
index 7074d37307..828af1fbb5 100644
--- a/packages/stage-manager/stagemanager-native_0.0.1.bb
+++ b/packages/stage-manager/stagemanager-native_0.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Helper script for packaged-staging.bbclass"
-PR = "r1"
+PR = "r7"
 
 SRC_URI = "file://stage-manager"
 LICENSE = "GPLv2"
diff --git a/packages/sword/sword_1.5.10.bb b/packages/sword/sword_1.5.10.bb
new file mode 100644
index 0000000000..151bba366d
--- /dev/null
+++ b/packages/sword/sword_1.5.10.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "The SWORD Project is an open source, cross-platform \
+(Linux, Windows, Solaris, MacOSX etc.) API and library for \
+Bible software with a constantly growing list of front-ends \
+(GUI, textmode, web-based, etc.) and a library of over 200 text modules"
+SECTION = "libs"
+HOMEPAGE = "http://www.e-sword.net/"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-${PV}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "--without-clucene --without-curl"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 07de84c8c2..da1fdf97cd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r45"
+PR = "r54"
 
 inherit task
 
@@ -11,43 +11,44 @@ PACKAGES = ' \
             task-distro-base \
             task-machine-base \
             \
-            task-base-acpi \
-            task-base-alsa \
-            task-base-apm \
+            ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
+            \
+            ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
+            ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
+            \
             task-base-bluetooth \
-            task-base-ext2 \
-            task-base-irda \
-            task-base-keyboard \
-            task-base-pci \
-            task-base-pcmcia \
-            task-base-phone \
-            task-base-screen \
-            task-base-serial \
-            task-base-touchscreen \
-            task-base-usbgadget \
-            task-base-usbhost \
             task-base-wifi \
             \
-            task-base-cramfs \
-            task-base-ipsec \
-            task-base-ipv6 \
-            task-base-nfs \
-            task-base-ppp \
-            task-base-smbfs \
-	    \
+            ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
+            \
             ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
-	    '
+            '
 
 #
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
-PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 #
 # linux-hotplug or none
@@ -87,6 +88,7 @@ RDEPENDS_task-base = "\
     \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
@@ -96,6 +98,7 @@ RDEPENDS_task-base = "\
     ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
     \
     ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
@@ -159,6 +162,7 @@ RRECOMMENDS_task-base-kernel24 = "\
     kernel-module-uinput"
 
 RRECOMMENDS_task-base-kernel26 = "\
+    kernel-module-nls-utf8 \
     kernel-module-input \
     kernel-module-uinput \
     kernel-module-rtc-dev \
@@ -186,6 +190,12 @@ RDEPENDS_task-base-ext2 = "\
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs"
 
+RRECOMMENDS_task-base-vfat = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-module-nls-iso8859-1 \
+    kernel-module-nls-cp437"
+
 RDEPENDS_task-base-alsa = "\
     alsa-utils-alsactl \
     alsa-utils-alsamixer"
@@ -293,11 +303,14 @@ RRECOMMENDS_task-base-usbhost = "\
     kernel-module-usb-storage "
 
 RDEPENDS_task-base-uboot = "\
-    uboot-utils"
+    u-boot"
 
 RDEPENDS_task-base-redboot = "\
     fis"
 
+RDEPENDS_task-base-apex = "\
+    apex-env"
+
 RDEPENDS_task-base-ppp = "\
     ppp \
     ppp-dialin"
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index fb09ad1a83..5663ff5a3d 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r41"
+PR = "r43"
 
 inherit task
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
new file mode 100644
index 0000000000..9da765ee94
--- /dev/null
+++ b/packages/tasks/task-devimage.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Image for development testing"
+PR = "r2"
+LICENSE = "MIT"
+
+inherit task
+
+DEVIMAGE_EXTRA_RDEPENDS ?= ""
+DEVIMAGE_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS = "\
+    devimage \
+    busybox dropbear udev \
+    util-linux-mount \
+    module-init-tools pcmciautils \
+    wireless-tools wpa-supplicant \
+    irda-utils acx-firmware \
+    kexec-tools \
+    ${DEVIMAGE_EXTRA_RDEPENDS} \
+    "
+
+RRECOMMENDS = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-modules \
+    ${DEVIMAGE_EXTRA_RRECOMMENDS} \
+    "
diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb
new file mode 100644
index 0000000000..9e2dce52f1
--- /dev/null
+++ b/packages/tasks/task-mipl.bb
@@ -0,0 +1,16 @@
+# Tasks for IPv6 Mobility extensions, needs:
+# CONFIG_IPV6_MIP6=y
+# CONFIG_IPV6=y
+# in the kernel .config
+
+DESCRIPTION = "Mobile ipv6 extensions"
+
+inherit task
+
+PACKAGE_ARCH = "all"
+
+RDEPENDS = "mipv6"
+RRECOMMENDS = "kernel-module-ipv6 \
+               kernel-module-mip6 \
+              "
+
diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb
index d27a855c9d..b840254176 100644
--- a/packages/tasks/task-native-sdk.bb
+++ b/packages/tasks/task-native-sdk.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
 DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
 RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
-	    patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev"
-PR = "r1"
+	    patch patchutils diffstat diffutils libstdc++-dev"
+PR = "r2"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
new file mode 100644
index 0000000000..a5d13e7e08
--- /dev/null
+++ b/packages/tasks/task-openmoko-base.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-base
+#
+DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
+RDEPENDS_task-openmoko-base = "\
+  matchbox-panel-2 \
+  matchbox-panel-2-applets \
+  matchbox-keyboard-inputmethod \
+  matchbox-keyboard-im \
+  matchbox-keyboard-applet \
+  matchbox-stroke \
+  openmoko-terminal2 \
+#  openmoko-keyboard \
+  openmoko-panel-battery \
+  openmoko-panel-bt \
+  openmoko-panel-clock \
+  openmoko-panel-usb \
+  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+  \
+  openmoko-today2 \
+#  openmoko-appmanager \
+"
diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb
new file mode 100644
index 0000000000..c5dbfb6f04
--- /dev/null
+++ b/packages/tasks/task-openmoko-examples.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "OpenMoko: Examples for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
\ No newline at end of file
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 1c97a355f1..e1fbbabfde 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r15"
+PR = "r17"
 
 inherit task
 
@@ -29,7 +29,6 @@ RDEPENDS_task-openmoko-feed = "\
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   synergy \
   tzdata \
-  timezones \
   tor \
   vnc \
   wxwidgets \
diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb
new file mode 100644
index 0000000000..0fdf3cac33
--- /dev/null
+++ b/packages/tasks/task-openmoko-games.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "OpenMoko: Games for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-games
+#
+DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+RDEPENDS_task-openmoko-games = "\
+  oh-puzzles \
+"
diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb
new file mode 100644
index 0000000000..59e6f24094
--- /dev/null
+++ b/packages/tasks/task-openmoko-linux.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "OpenMoko: Core system for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-core
+#
+DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
+RDEPENDS_task-openmoko-linux = "\
+  task-base \
+  netbase \
+  sysfsutils \
+  modutils-initscripts \
+  module-init-tools-depmod \
+  rsync \
+  screen \
+  psplash \
+  fbset \
+  fbset-modes \
+#  update-alternatives \
+"
diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb
new file mode 100644
index 0000000000..e75dc4b4ff
--- /dev/null
+++ b/packages/tasks/task-openmoko-net.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "OpenMoko: Networking for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-net
+#
+DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
+RDEPENDS_task-openmoko-net = "\
+  bluez-utils \
+  bridge-utils \
+"
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
new file mode 100644
index 0000000000..49e4e66859
--- /dev/null
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r72"
+
+inherit task
+
+#
+# task-openmoko-phone
+#
+DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
+RDEPENDS_task-openmoko-phone = "\
+  gsmd \
+  libgsmd-tools \
+  openmoko-dialer2 \
+  openmoko-panel-gsm \
+#  ppp \
+"
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
new file mode 100644
index 0000000000..1eea1a14a1
--- /dev/null
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-pim
+#
+DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
+RDEPENDS_task-openmoko-pim = "\
+  eds-dbus \
+  openmoko-calculator2 \
+  openmoko-contacts2 \
+  openmoko-dates2 \
+  openmoko-feedreader2 \
+  openmoko-browser2 \
+  openmoko-appmanager2 \
+  openmoko-tasks2 \
+  openmoko-mediaplayer2 \
+  openmoko-messages2 \
+"
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
new file mode 100644
index 0000000000..e34bb42b2f
--- /dev/null
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+#
+# task-openmoko-ui
+#
+DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
+PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
+RDEPENDS_task-openmoko-ui = "\
+  gdk-pixbuf-loader-png \
+  gdk-pixbuf-loader-gif \
+  gdk-pixbuf-loader-xpm \
+  gdk-pixbuf-loader-jpeg \
+  pango-module-basic-x \
+  pango-module-basic-fc \
+  gtk+ \
+  matchbox-wm \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  \
+  settings-daemon \
+  notification-daemon \
+  neod \
+  libnotify \
+  \
+  openmoko-session2 \
+  openmoko-sound-system2 \
+  openmoko-sound-theme-standard2 \
+  \
+  gpe-scap \
+"
+
+# Handle theming. FIXME: properly use machine database in a smart way,
+# taking into account not only size but also PPI! Ultimately this might
+# need recomputing some theme files and images on-the-fly :/ SVG and logical
+# theme description anyone? Or simply Edje to the rescue! :D
+THEMES          = "openmoko-icon-theme-standard2      openmoko-theme-standard2"
+THEMES_a780     = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_e680     = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_a1200    = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre2   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre6   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+
+RDEPENDS_task-openmoko-ui += "${THEMES}"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 76e0b843f7..730ea339aa 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -6,158 +6,26 @@ PR = "r71"
 
 inherit task
 
-XSERVER ?= "xserver-kdrive-fbdev"
+PACKAGES += "\
+        task-openmoko-everything \
+"
 
-PACKAGES = "\
+RDEPENDS_task-openmoko-everything := "\
   task-openmoko-linux \
   task-openmoko-ui \
   task-openmoko-base \
   task-openmoko-phone \
   task-openmoko-pim \
   task-openmoko-net \
-  \
   task-openmoko-games \
   task-openmoko-examples \
-"
-
-RDEPENDS_task-openmoko-everything := "\
-  ${PACKAGES} \
   task-openmoko-debug \
   task-openmoko-native-sdk \
 "
 
-#
-# task-openmoko-core
-#
-DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
-RDEPENDS_task-openmoko-linux = "\
-  task-base \
-  netbase \
-  sysfsutils \
-  modutils-initscripts \
-  module-init-tools-depmod \
-  rsync \
-  screen \
-  psplash \
-  fbset \
-  fbset-modes \
-#  update-alternatives \
-"
-
-#
-# task-openmoko-ui
-#
-DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
-PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
-RDEPENDS_task-openmoko-ui = "\
-  gdk-pixbuf-loader-png \
-  gdk-pixbuf-loader-gif \
-  gdk-pixbuf-loader-xpm \
-  gdk-pixbuf-loader-jpeg \
-  pango-module-basic-x \
-  pango-module-basic-fc \
-  gtk+ \
-  matchbox-wm \
-  ${XSERVER} \
-  xserver-kdrive-common \
-  xserver-nodm-init \
-  xauth \
-  xhost \
-  xset \
-  xrandr \
-  \
-  settings-daemon \
-  notification-daemon \
-  neod \
-  libnotify \
-  \
-  openmoko-session2 \
-  openmoko-sound-system2 \
-  openmoko-sound-theme-standard2 \
-  \
-  gpe-scap \
-"
 
-# Handle theming. FIXME: properly use machine database in a smart way,
-# taking into account not only size but also PPI! Ultimately this might
-# need recomputing some theme files and images on-the-fly :/ SVG and logical
-# theme description anyone? Or simply Edje to the rescue! :D
-THEMES          = "openmoko-icon-theme-standard2      openmoko-theme-standard2"
-THEMES_a780     = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_e680     = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_a1200    = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_rokre2   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_rokre6   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 
-RDEPENDS_task-openmoko-ui += "${THEMES}"
-PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
 
-#
-# task-openmoko-base
-#
-DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
-RDEPENDS_task-openmoko-base = "\
-  matchbox-panel-2 \
-  matchbox-panel-2-applets \
-  matchbox-keyboard-inputmethod \
-  matchbox-keyboard-im \
-  matchbox-keyboard-applet \
-  matchbox-stroke \
-  openmoko-terminal2 \
-#  openmoko-keyboard \
-  openmoko-panel-battery \
-  openmoko-panel-bt \
-  openmoko-panel-clock \
-  openmoko-panel-usb \
-  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
-  \
-  openmoko-today2 \
-#  openmoko-appmanager \
-"
 
-#
-# task-openmoko-phone
-#
-DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
-RDEPENDS_task-openmoko-phone = "\
-  gsmd \
-  libgsmd-tools \
-  openmoko-dialer2 \
-  openmoko-panel-gsm \
-#  ppp \
-"
 
-#
-# task-openmoko-pim
-#
-DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
-RDEPENDS_task-openmoko-pim = "\
-  eds-dbus \
-  openmoko-calculator2 \
-  openmoko-contacts2 \
-  openmoko-dates2 \
-  openmoko-feedreader2 \
-  openmoko-browser2 \
-  openmoko-appmanager2 \
-  openmoko-tasks2 \
-  openmoko-mediaplayer2 \
-  openmoko-messages2 \
-"
 
-#
-# task-openmoko-net
-#
-DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
-RDEPENDS_task-openmoko-net = "\
-  bluez-utils \
-  bridge-utils \
-"
-
-#
-# task-openmoko-games
-#
-DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
-RDEPENDS_task-openmoko-games = "\
-  oh-puzzles \
-"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 444eb73781..65dc7661c9 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml20"
+PR = "ml22"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -9,10 +9,8 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
-		python-evas			\
-		python-ecore		\
-#		python-emotion		\
-#		python-edje			\
+		python-pydirectfb		\
+		python-efl			\
 		python-pycurl		\
 		python-fam			\
 		python-fnorb		\
@@ -52,6 +50,7 @@ RDEPENDS = "\
 		python-pyiw		\
 		python-pylinda		\
 		python-pylint		\
+		python-pyqt			\
 		python-pyraf		\
 		python-pyreverse	\
 		python-pyrex		\
@@ -74,6 +73,7 @@ RDEPENDS = "\
 		python-spydi		\
 		python-spyro		\
 		python-sqlobject	\
+		python-sword		\
 		python-tlslite		\
 		python-urwid		\
 		python-vmaps		\
@@ -88,9 +88,7 @@ BROKEN_PACKAGES = "\
 		python-egenix-mx-base \
 		python-gammu \
 		python-m2crypto \
-		python-sword \
 		python-mysqldb \
-        python-pyqt     \
         python-pyqwt        \
 "
 
diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index 25841b357a..5dbd59d18a 100644
--- a/packages/tasks/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
@@ -20,7 +20,6 @@ RDEPENDS = "\
 		python-ao 		\
 		python-constraint	\
 		python-dialog		\
-		python-egenix-mx-base   \
 		python-fnorb		\
 		python-fpconst		\
 		python-gnosis		\
@@ -28,7 +27,7 @@ RDEPENDS = "\
 		python-irclib		\
 		python-itools		\
 		python-libgmail		\
-		python-logilab		\
+		python-logilab-common	\
 		python-lxml		\
 		python-mad		\
 		python-native		\
@@ -53,7 +52,6 @@ RDEPENDS = "\
 		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
-		python-quicklauncher    \
 		python-scapy		\
 		python-scons		\
 		python-sip		\
@@ -70,6 +68,7 @@ RDEPENDS = "\
 		twisted			\
 		zope"
 
+#fixme add python-egenix-mx-base if brought in from nonworking
 #fixme add python-pycap once libdnet is in again
 #fixme add python-pyx once kpathwhich-native is there
 #fixme add packages dynamically
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index ecb3189741..4b8fde02c0 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -20,20 +20,23 @@ ALLOW_EMPTY = "1"
 SLUGOS_STANDARD_RDEPENDS = ""
 SLUGOS_STANDARD_RRECOMMENDS = ""
 
-# diff, cpio and find are required for reflash and turnup ram.
-# Removing these probably leaves the system bootable, but standard
-# openslug and ucslugc stuff won't work, so only take these out in
-# very non-standard turnkey slugos builds.
-#
-# udev is the default way of handling devices, there is no guarantee
-# that the static device table is completely correct (it is just
-# known to be sufficient for boot.)
-SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils"
+# diff, cpio and find are required for turnup and ipkg.
+SLUGOS_STANDARD_RRECOMMENDS += "\
+diffutils \
+cpio \
+findutils \
+"
 
 # These lines add support for formatting ext2 and ext3 file systems
 # on a hard disk attached to the NSLU2.  ext3 is the standard Linux
 # file system.
-SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+SLUGOS_STANDARD_RRECOMMENDS += "\
+e2fsprogs-mke2fs \
+e2fsprogs-fsck \
+e2fsprogs-e2fsck \
+e2fsprogs-badblocks \
+e2fsprogs-blkid \
+"
 
 # These lines add support for an X/Y/ZModem package called lrzsz
 # (this is of use for people with modified NSLU2 hardware which
@@ -66,7 +69,6 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-
 # Add daemon required for HW RNG support
 SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools"
 SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = ""
@@ -93,6 +95,9 @@ kernel-module-ixp4xx-qmgr \
 kernel-module-via-velocity \
 "
 
+# Other candidate packages that have been considered and
+# are intentionally excluded from the base flash image.
+#
 # portmap \
 # kexec-tools \
 # kernel-module-nfs \
@@ -118,7 +123,6 @@ RDEPENDS += "\
 	module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	beep \
-	e2fsprogs-blkid \
 	util-linux-mount \
 	util-linux-umount \
 	util-linux-swaponoff \
@@ -126,6 +130,7 @@ RDEPENDS += "\
 	${SLUGOS_STANDARD_RDEPENDS} \
 	${DISTRO_EXTRA_RDEPENDS}"
 
+DISTRO_EXTRA_RRECOMMENDS ?= ""
 RRECOMMENDS += "\
 	openssh \
 	${SLUGOS_STANDARD_RRECOMMENDS} \
diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb
index 945b4774f9..bcb2d370a6 100644
--- a/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ b/packages/tasks/task-toolchain-openmoko-sdk.bb
@@ -26,6 +26,6 @@ RDEPENDS_${PN} = "\
     libmokoui2-dev \
     libmokopanelui2-dev \
     libmokojournal2-dev \
-    \
     openmoko-sample2-src \
+    openmoko-toolchain-scripts \
 "
diff --git a/packages/timezones/timezones_1.2.0.bb b/packages/timezones/timezones_1.2.0.bb
deleted file mode 100644
index 8efe72d45c..0000000000
--- a/packages/timezones/timezones_1.2.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Timezone data"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};tag=v1_2_0;module=opie/root"
-S = "${WORKDIR}/root"
-
-do_install() {
-	install -d ${D}${datadir}/
-	cp -fa usr/share/zoneinfo ${D}${datadir}/
-	find ${D}${datadir} -name "CVS"|xargs rm -rf
-}
-
-PACKAGES_DYNAMIC = "timezone-*"
-
-python populate_packages_prepend() {
-        pkgregex = "^(.*)"
-        pkgpattern = "timezone-%s"
-        pkgdescription = "Timezone for %s"
-
-        do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern,
-                          description=pkgdescription,allow_dirs=True )
-}
-
-FILES_${PN} =  "${datadir}/zoneinfo/America/Denver      \
-                ${datadir}/zoneinfo/America/New_York    \
-                ${datadir}/zoneinfo/America/Los_Angeles \
-                ${datadir}/zoneinfo/Australia/Brisbane  \
-                ${datadir}/zoneinfo/Europe/Berlin       \
-                ${datadir}/zoneinfo/Asia/Tokyo          "
diff --git a/packages/uboot/files/glamo-ram-init.patch b/packages/uboot/files/glamo-ram-init.patch
deleted file mode 100644
index 4c12074347..0000000000
--- a/packages/uboot/files/glamo-ram-init.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/board/neo1973/common/lowlevel_init.S b/board/neo1973/common/lowlevel_init.S
-index 582aa0e..92a9c7b 100644
---- a/board/neo1973/common/lowlevel_init.S
-+++ b/board/neo1973/common/lowlevel_init.S
-@@ -67,11 +67,11 @@
- #define B0_PMC		 	0x0	/* normal */
- 
- /* BANK1CON */
--#define B1_Tacs		 	0x0	/*  0clk */
--#define B1_Tcos		 	0x1	/*  1clk */
--#define B1_Tacc		 	0x4	/*  4clk */
--#define B1_Tcoh		 	0x1	/*  1clk */
--#define B1_Tah		 	0x0	/*  0clk */
-+#define B1_Tacs		 	0x3	/*  4clk */
-+#define B1_Tcos		 	0x3	/*  4clk */
-+#define B1_Tacc		 	0x7	/*  14clk */
-+#define B1_Tcoh		 	0x3	/*  4clk */
-+#define B1_Tah		 	0x3	/*  4clk */
- #define B1_Tacp		 	0x0
- #define B1_PMC		 	0x0
- 
diff --git a/packages/uboot/u-boot-1.2.0/env-Makefile.patch b/packages/uboot/u-boot-1.2.0/env-Makefile.patch
index ad3a6b39a3..f6e9cb39ae 100644
--- a/packages/uboot/u-boot-1.2.0/env-Makefile.patch
+++ b/packages/uboot/u-boot-1.2.0/env-Makefile.patch
@@ -1,24 +1,19 @@
---- u-boot-1.1.2.orig/tools/env/Makefile	2003-06-27 14:32:48.000000000 -0700
-+++ u-boot-1.1.2/tools/env/Makefile	2006-11-08 12:33:43.000000000 -0800
-@@ -27,7 +27,7 @@
- all:	fw_printenv
+--- u-boot-1.2.0/tools/env/Makefile.orig	2007-12-12 12:52:51.508745236 -0800
++++ u-boot-1.2.0/tools/env/Makefile	2007-12-12 12:54:09.997218038 -0800
+@@ -31,7 +31,7 @@
+ all:	$(obj)fw_printenv
  
- fw_printenv:	$(SOURCES) $(HEADERS)
--	$(CROSS_COMPILE)gcc -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv
-+	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -Wall -DUSE_HOSTCC $(SOURCES) -o fw_printenv
+ $(obj)fw_printenv:	$(SRCS) $(HEADERS)
+-	$(CROSS_COMPILE)gcc $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
++	$(CROSS_COMPILE)gcc $(TARGET_CFLAGS) -idirafter ../../include -DUSE_HOSTCC $(SRCS) -o $(obj)fw_printenv
  
  clean:
- 	rm -f fw_printenv crc32.c
-@@ -37,9 +37,9 @@
+ 	rm -f $(obj)fw_printenv $(obj)crc32.c
+@@ -43,6 +43,6 @@
  
- #########################################################################
- 
--.depend:	Makefile $(SOURCES)
--		$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
-+#.depend:	Makefile $(SOURCES)
-+#		$(CC) -M $(HOST_CFLAGS) $(TARGET_CPPFLAGS) -DUSE_HOSTCC $(SOURCES) > $@
+ include $(TOPDIR)/rules.mk
  
--sinclude .depend
-+#sinclude .depend
+-sinclude $(obj).depend
++#sinclude $(obj).depend
  
  #########################################################################
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
index d0d47d84d8..e7812a5ed0 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
@@ -1,6 +1,9 @@
 require uboot-openmoko_svn.bb
 
+inherit native
+
 PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238"
+PR = "r1"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
 file://uboot-machtypes.patch;patch=1 \
@@ -72,12 +75,12 @@ do_compile () {
         oe_runmake tools
 }
 
-do_deploy () {
-        install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
-        ln -sf ${STAGING_BINDIR_NATIVE}/uboot-mkimage ${STAGING_BINDIR_NATIVE}/mkimage
+do_stage () {
+        install -m 0755 tools/mkimage ${STAGING_BINDIR}/uboot-mkimage
+        ln -sf ${STAGING_BINDIR}/uboot-mkimage ${STAGING_BINDIR}/mkimage
 }
 
-do_deploy[dirs] = "${S}"
-addtask deploy before do_package after do_install
-
+do_deploy () {
+:
+}
 
diff --git a/packages/uboot/uboot-utils_1.2.0.bb b/packages/uboot/u-boot-utils-native_1.2.0.bb
index fe9b3aca26..b04b366ffe 100644
--- a/packages/uboot/uboot-utils_1.2.0.bb
+++ b/packages/uboot/u-boot-utils-native_1.2.0.bb
@@ -1,13 +1,16 @@
-DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
+DESCRIPTION = "U-boot bootloader mkimage utility"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r6"
+ALLOW_EMPTY = "1"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
 S = "${WORKDIR}/u-boot-${PV}"
 
+inherit native
+
 do_configure() {
 	:
 }
@@ -19,7 +22,6 @@ do_compile () {
 
 # install mkimage for the kernel makefile
 do_stage() {
-	install -d ${STAGING_BINDIR_NATIVE}
-	install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/
+	install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/
 }
 
diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/uboot/u-boot-utils_1.2.0.bb
new file mode 100644
index 0000000000..1734b41a0e
--- /dev/null
+++ b/packages/uboot/u-boot-utils_1.2.0.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "U-boot bootloader OS env. access tools"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "mtd-utils"
+PR = "r7"
+
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+        file://fw_env.c.patch;patch=1 \
+        file://tools-Makefile.patch;patch=1 \
+        file://env-Makefile.patch;patch=1 \
+        file://fw_env.config"
+
+S = "${WORKDIR}/u-boot-${PV}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-${PV}"
+
+do_configure() {
+        :
+}
+
+do_compile () {
+        oe_runmake Sandpoint8240_config
+        oe_runmake tools
+}
+
+do_install () {
+        :
+}
+
+do_install_openprotium () {
+        install -d      ${D}/sbin
+        install -d      ${D}${sysconfdir}
+        install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+        install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
+        install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
+}
+
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb
index 509f9e2df0..1e59e0746d 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/uboot/uboot-openmoko_svn.bb
@@ -4,8 +4,9 @@ LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
 PROVIDES = "virtual/bootloader"
-PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}"
-PR = "r2"
+LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
+PV = "1.3.1${LOCALVERSION}"
+PR = "r1"
 
 SRCREV_FORMAT = "patches"
 
@@ -19,7 +20,6 @@ SRC_URI = "\
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
   file://makefile-no-dirafter.patch;patch=1 \
-  file://glamo-ram-init.patch;patch=1 \
 "
 S = "${WORKDIR}/git"
 
diff --git a/packages/uicmoc/uicmoc4-native_4.2.3.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb
deleted file mode 100644
index 27b5b5bb31..0000000000
--- a/packages/uicmoc/uicmoc4-native_4.2.3.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "libx11-native libxext-native"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL QPL"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
-
-S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \
-		-no-nis -no-cups -no-exceptions  \
-		-no-accessibility -no-libjpeg    \
-                -no-nas-sound -no-sm             \
-                -no-xshape    -no-xinerama       \
-                -no-xcursor   -no-xrandr         \
-                -no-xrender   -no-fontconfig     \
-                -no-tablet    -no-xkb            \
-                -no-libpng                       \
-                -verbose -release  -fast -static "
-EXTRA_OEMAKE = " "
-
-do_configure() {
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-do_compile() {
-	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/corelib   && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/xml       && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}"
-}
-
-do_stage() {
-        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
-        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
-        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
-}
diff --git a/packages/uicmoc/uicmoc4-native_4.3.0.bb b/packages/uicmoc/uicmoc4-native_4.3.0.bb
deleted file mode 100644
index bc5aba4102..0000000000
--- a/packages/uicmoc/uicmoc4-native_4.3.0.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "libx11-native libxext-native zlib-native"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL QPL"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
-
-S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
-		-qt-libjpeg -qt-gif -system-zlib \
-		-no-nis -no-cups -no-exceptions  \
-		-no-accessibility -no-libjpeg    \
-                -no-nas-sound -no-sm             \
-                -no-xshape    -no-xinerama       \
-                -no-xcursor   -no-xrandr         \
-                -no-xrender   -no-fontconfig     \
-                -no-tablet    -no-xkb            \
-                -no-libpng                       \
-                -verbose -release  -fast -static \
-                -qt3support "
-EXTRA_OEMAKE = " "
-
-do_configure() {
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-do_compile() {
-	unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-	cd ${S}/src/tools/moc  && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/corelib    && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/sql        && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/qt3support && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/xml        && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic  && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/rcc  && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/network    && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/gui        && oe_runmake CC="${CC}" CXX="${CXX}"
-	cd ${S}/src/tools/uic3 && oe_runmake CC="${CC}" CXX="${CXX}"
-}
-
-do_stage() {
-        install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
-        install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
-        install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
-        install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
-        install -d ${STAGING_DIR_NATIVE}/qt4/
-        install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/
-}
diff --git a/packages/update-rc.d/files/.mtn2git_empty b/packages/update-rc.d/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/update-rc.d/files/.mtn2git_empty
diff --git a/packages/update-rc.d/files/add-verbose.patch b/packages/update-rc.d/files/add-verbose.patch
new file mode 100644
index 0000000000..0f068308f6
--- /dev/null
+++ b/packages/update-rc.d/files/add-verbose.patch
@@ -0,0 +1,47 @@
+--- update-rc.d/update-rc.d.org	2005-01-03 00:30:47.000000000 +0200
++++ update-rc.d/update-rc.d	2007-12-01 19:41:08.000000000 +0200
+@@ -19,6 +19,7 @@
+ notreally=0
+ force=0
+ dostart=0
++verbose=0
+ 
+ usage()
+ {
+@@ -28,6 +29,7 @@
+        update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
+ 		-n: not really
+ 		-f: force
++		-v: verbose
+ 		-r: alternate root path (default is /)
+ 		-s: invoke start methods if appropriate to current runlevel
+ EOF
+@@ -69,7 +71,7 @@
+ 	lev=`echo $2 | cut -d/ -f1`
+ 	nn=`echo $2 | cut -d/ -f2`
+ 	fn="${etcd}${lev}.d/${startstop}${nn}${bn}"
+-	echo "  $fn -> ../init.d/$bn"
++	[ $verbose -eq 1 ] && echo "  $fn -> ../init.d/$bn"
+ 	if [ $notreally -eq 0 ]; then
+ 		mkdir -p `dirname $fn`
+  		ln -s ../init.d/$bn $fn
+@@ -89,7 +91,7 @@
+ 		exit 0
+ 	fi
+ 
+-	echo " Adding system startup for $initd/$bn ..."
++	echo " Adding system startup for $initd/$bn."
+ 
+ 	for i in $startlinks; do
+ 		dolink S $i
+@@ -105,6 +107,10 @@
+ 			shift
+ 			continue
+ 			;;
++		-v)	verbose=1
++			shift
++			continue
++			;;
+ 		-f)	force=1
+ 			shift
+ 			continue
diff --git a/packages/update-rc.d/update-rc.d_0.7.bb b/packages/update-rc.d/update-rc.d_0.7.bb
index 8070197b82..dd370e6ff8 100644
--- a/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/packages/update-rc.d/update-rc.d_0.7.bb
@@ -3,9 +3,10 @@ PRIORITY = "standard"
 DESCRIPTION = "Manage symlinks in /etc/rcN.d"
 LICENSE = "GPL"
 S = "${WORKDIR}/update-rc.d"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7"
+SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7 \
+           file://add-verbose.patch;patch=1"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
index 0c47afe7fd..640fa34174 100644
--- a/packages/webkit/files/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
@@ -11,12 +11,47 @@ qt-port:DEFINES += BUILDING_QT__=1
 qt-port:!building-libs {
     QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
     LIBS += -lQtWebKit
+    DEPENDPATH += $$PWD/WebKit/qt/Api
+}
+
+gtk-port:!building-libs {
+    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+    LIBS += -lWebKitGtk
+    DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport
+}
+
+gtk-port {
+    CONFIG += link_pkgconfig
+
+    DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
+
+    # We use FreeType directly with Cairo
+    PKGCONFIG += cairo-ft
+
+    directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
+    else: PKGCONFIG += cairo gtk+-2.0
+
+    # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
+    CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
+
+    # We use the curl http backend on all platforms
+    PKGCONFIG += libcurl
+
+    LIBS += -lWebKitGtk -ljpeg -lpng
+
+    QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+    QMAKE_LIBS += $$system(icu-config --ldflags)
+
+    # This set of warnings is borrowed from the Mac build
+    QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
+
+    # These flags are based on optimization experience from the Mac port:
+    # Helps code size significantly and speed a little
+    QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+
+    DEPENDPATH += $$PWD/JavaScriptCore/API
+    INCLUDEPATH += $$PWD
 }
-gtk-port:CONFIG += link_pkgconfig
-gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
-gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
-gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
-gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
 
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {
@@ -32,7 +67,7 @@ gtk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
     $$BASE_DIR/WebCore/loader/gtk \
     $$BASE_DIR/WebCore/page/gtk \
-    $$BASE_DIR/WebKit/gtk/Api \
+    $$BASE_DIR/WebKit/gtk/WebView \
     $$BASE_DIR/WebKit/gtk/WebCoreSupport
 INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/ \
diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
index aab0209a93..027017bd8d 100644
--- a/packages/webkit/files/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
@@ -3,9 +3,15 @@ CONFIG += ordered
 !gtk-port:CONFIG += qt-port
 qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
 SUBDIRS += \
-        WebCore
+        WebCore \
+        JavaScriptCore/kjs/testkjs.pro
+
+qt-port {
+    SUBDIRS += WebKit/qt/QtLauncher
+
+    !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+}
 
-qt-port:SUBDIRS += \
-        WebKit/qt/QtLauncher
 gtk-port:SUBDIRS += \
-        WebKitTools/GtkLauncher
+        WebKitTools/GtkLauncher \
+        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 262c6820db..c726020d1a 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -1,5 +1,8 @@
 DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
 
+# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need:
+# DEPENDS += " gstreamer gst-plugins-base gnome-vfs "
+
 
 WEBKIT_PORT = "gtk-port"
 WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
@@ -9,7 +12,7 @@ FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
 
 require webkit.inc
 
-PR = "r3"
+PR = "r4"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc
index 2ff61091c3..81c2d91bf8 100644
--- a/packages/webkit/webkit.inc
+++ b/packages/webkit/webkit.inc
@@ -34,7 +34,13 @@ do_configure() {
 do_compile_prepend() {
 	mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
 	cd ${S}/JavaScriptCore/pcre 
-	${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+	if test -e dftables.c
+	then
+	    ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+	elif test -e dftables.cpp
+	then
+	    ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
+	fi
 	cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
 	cd ${S}/WebKitBuilds/Debug
 }
diff --git a/packages/x11vnc/x11vnc_0.9.3.bb b/packages/x11vnc/x11vnc_0.9.3.bb
index edd165374f..04ac87b444 100644
--- a/packages/x11vnc/x11vnc_0.9.3.bb
+++ b/packages/x11vnc/x11vnc_0.9.3.bb
@@ -3,7 +3,7 @@ SECTION = "x11/utils"
 HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
 AUTHOR = "Karl Runge"
 LICENSE = "GPL"
-DEPENDS = "openssl virtual/libx11 libxext avahi jpeg-62 zlib"
+DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
 
 SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz"
 
diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
index e4fa10f07f..d90e82081e 100644
--- a/packages/xfce/xfce-mcs-manager.inc
+++ b/packages/xfce/xfce-mcs-manager.inc
@@ -3,7 +3,7 @@
 # Released under the MIT license (see packages/COPYING)
 
 DESCRIPTION="XFCE4 Settings manager."
-DEPENDS="libxfcegui4 libxfce4mcs"
+DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
 SECTION = "x11"
 PR = "r1"
 
diff --git a/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch b/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch
new file mode 100644
index 0000000000..0423ee1eed
--- /dev/null
+++ b/packages/xkbd/xkbd-0.8.15/add-default-common-slides.patch
@@ -0,0 +1,44 @@
+diff -r 6b20ef8fbdee src/kb.c
+--- a/src/kb.c	Tue Nov 27 21:28:21 2007 +0200
++++ b/src/kb.c	Tue Nov 27 22:27:09 2007 +0200
+@@ -954,6 +954,13 @@ void kb_send_keypress(button *b)
+   int slide_flag = 0;
+ 
+   struct keycodeEntry vk_keycodes[10];
++  
++  static KeySym ksSpace, ksBackSpace, ksReturn;
++  if (!ksSpace) {
++    ksSpace = XStringToKeysym("space");
++    ksBackSpace = XStringToKeysym("BackSpace");
++    ksReturn = XStringToKeysym("Return");
++  }
+ 
+   if (b->kb->state & KB_STATE_SHIFT || b->kb->state & KB_STATE_CAPS)
+   {
+@@ -981,20 +988,17 @@ void kb_send_keypress(button *b)
+ 	    ks = b->slide_up_ks;
+ 	    if (ks == 0) ks = b->shift_ks;
+ 	    break;
+-	  case down : /* hold ctrl */
++	  case down :
+ 	    ks = b->slide_down_ks;
+-	    if (ks == 0) slide_flag = KB_STATE_CTRL;
++	    if (ks == 0) ks = ksReturn;
+ 	    break;
+-	  case left : /* hold alt */
++	  case left :
+ 	    ks = b->slide_left_ks;
+-	    if (ks == 0) 
+-	      {
+-		ks = b->mod_ks;
+-		slide_flag = KB_STATE_MOD;
+-	      }
++	    if (ks == 0) ks = ksBackSpace;
+ 	    break;
+-	  case right : /* hold alt */
++	  case right :
+ 	    ks = b->slide_right_ks;
++	    if (ks == 0) ks = ksSpace;
+ 	    break;
+ 	  case none:
+ 	    break;
diff --git a/packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch b/packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch
new file mode 100644
index 0000000000..60617a671c
--- /dev/null
+++ b/packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch
@@ -0,0 +1,12 @@
+diff -r 1eb4100bbe39 xkbd.desktop
+--- a/xkbd.desktop	Wed Nov 28 02:14:35 2007 +0200
++++ b/xkbd.desktop	Wed Nov 28 02:15:01 2007 +0200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+-Name=Keyboard
+-Comment=Virtual Keyboard
++Name=Ol' Good Keyboard
++Comment=xkbd the Virtual Keyboard
+ Exec=xkbd
+ Type=Application
+ Icon=xkbd.png
diff --git a/packages/xkbd/xkbd-layout-ru/.mtn2git_empty b/packages/xkbd/xkbd-layout-ru/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xkbd/xkbd-layout-ru/.mtn2git_empty
diff --git a/packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd b/packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd
new file mode 100644
index 0000000000..0b4ca0f056
--- /dev/null
+++ b/packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd
@@ -0,0 +1,1353 @@
+#Птн, 01 Апр 2005 01:56:58 +0300 
+#It was downloaded from http://whitenoise.ssrlab.com/pda/xkbd
+#Copyright:
+#This software is copyright (c) 2005 by Dmitry Zhadinets
+#You are free to distribute this keyboard file under the terms of
+#the GNU General Public License.
+#Version: 0.1.1
+#For posting bugreports use this way <whitenoise at ssrlab dot com>
+<global>
+	render xft
+	font Verdana-6|fixed
+	col  200:255:200
+	down_col  100:100:200
+	txt_col  0:0:0
+	border_col 128:128:128
+	button_style rounded
+</global>
+<layout>
+	<row>
+		<key>
+			key_span_width	1
+			bg		196:216:248
+			default		Esc
+			default_ks	Escape
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		`
+			default_ks	quoteleft
+			shift		~
+			shift_ks	asciitilde
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		1
+			default_ks	1
+			shift		!
+			shift_ks	exclam
+		</key>
+		<key>
+			key_span_width	1
+			bg		248:216:196
+			default		2
+			default_ks	2
+			shift		@
+			shift_ks	at
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		3
+			default_ks	3
+			shift		#
+			shift_ks	numbersign
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		4
+			default_ks	4
+			shift		$
+			shift_ks	dollar
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		5
+			default_ks	5
+			shift		%
+			shift_ks	percent
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		6
+			default_ks	6
+			shift		^
+			shift_ks	asciicircum
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		7
+			default_ks	7
+			shift		&
+			shift_ks	ampersand
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		8
+			default_ks	8
+			shift		*
+			shift_ks	asterisk
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		9
+			default_ks	9
+			shift		(
+			shift_ks	parenleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		0
+			default_ks	0
+			shift		)
+			shift_ks	parenright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		-
+			default_ks	minus
+			shift		_
+			shift_ks	underscore
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		= 
+			default_ks	equal
+			shift		+
+			shift_ks	plus
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+#			img		/usr/share/xkbd/img/backspace.xpm
+			default		<-
+			default_ks	BackSpace
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		Tab
+			default_ks	Tab
+		</key>
+		<key>
+			key_span_width	1
+			default		q
+			default_ks	q
+			shift		Q
+			shift_ks	Q
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		w
+			default_ks	w
+			shift		W
+			shift_ks	W
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		e
+			default_ks	e
+			shift		E
+			shift_ks	E
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		r
+			default_ks	r
+			shift		R
+			shift_ks	R
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		t
+			default_ks	t
+			shift		T
+			shift_ks	T
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		y
+			default_ks	y
+			shift		Y
+			shift_ks	Y
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		u
+			default_ks	u
+			shift		U
+			shift_ks	U
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		i
+			default_ks	i
+			shift		I
+			shift_ks	I
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		o
+			default_ks	o
+			shift		O
+			shift_ks	O
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		p
+			default_ks	p
+			shift		P
+			shift_ks	P
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		[
+			default_ks	bracketleft
+			shift		{
+			shift_ks	braceleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		]
+			default_ks	bracketright
+			shift		}
+			shift_ks	braceright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		\
+			default_ks	backslash
+			shift		|
+			shift_ks	bar
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		CAP
+			default_ks	Caps_Lock
+		</key>
+		<key>
+			key_span_width	1
+			default		a
+			default_ks	a
+			shift		A
+			shift_ks	A
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		s
+			default_ks	s
+			shift		S
+			shift_ks	S
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		d
+			default_ks	d
+			shift		D
+			shift_ks	D
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		f
+			default_ks	f
+			shift		F
+			shift_ks	F
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		g
+			default_ks	g
+			shift		G
+			shift_ks	G
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		h
+			default_ks	h
+			shift		H
+			shift_ks	H
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		j
+			default_ks	j
+			shift		J
+			shift_ks	J
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		k
+			default_ks	k
+			shift		K
+			shift_ks	K
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		l
+			default_ks	l
+			shift		L
+			shift_ks	L
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		;
+			default_ks	semicolon
+			shift		:
+			shift_ks	colon
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		'
+			default_ks	quoteright
+			shift		"
+			shift_ks	quotedbl
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		Ret
+			default_ks	Return
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		SH
+			default_ks	Shift_L
+		</key>
+		<key>
+			key_span_width	1
+			default		z
+			default_ks	z
+			shift		Z
+			shift_ks	Z
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		x
+			default_ks	x
+			shift		X
+			shift_ks	X
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		c
+			default_ks	c
+			shift		C
+			shift_ks	C
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		v
+			default_ks	v
+			shift		V
+			shift_ks	V
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		b
+			default_ks	b
+			shift		B
+			shift_ks	B
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		n
+			default_ks	n
+			shift		N
+			shift_ks	N
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		m
+			default_ks	m
+			shift		M
+			shift_ks	M
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		,
+			default_ks	comma
+			shift		<
+			shift_ks	less
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		.
+			default_ks	period
+			shift		>
+			shift_ks	greater
+
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		/
+			default_ks	slash
+			shift		?
+			shift_ks	question
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		SH
+			default_ks	Shift_R
+		</key>
+	</row>
+	<row>
+		<key>
+			bg 		196:216:248
+			default		Ctrl
+			default_ks	Control_L
+		</key>
+		<key>
+			bg		255:255:255
+			default		RU
+			switch		1
+		</key>
+		<key>
+			bg		255:255:255
+			default		123
+			switch		2
+		</key>
+		<key>
+			bg		200:200:200
+			default_ks	space
+			width		60
+		</key>
+		<key>
+			bg 		196:216:248
+			default		Alt
+			default_ks	Alt_L
+		</key>
+		<key>
+			bg 		255:255:255
+	    		default		<
+	    		default_ks	Left
+		</key>
+		<key>
+			bg 		255:255:255
+			default		>
+			default_ks	Right
+		</key>
+		<key>
+			bg 		255:255:255
+			default		^
+			default_ks	Up
+		</key>
+		<key>
+			bg 		255:255:255
+			default		v
+			default_ks	Down
+		</key>		
+	</row>
+</layout>
+<layout>
+	<row>
+		<key>
+			key_span_width	1
+			bg		196:216:248
+			default		Esc
+			default_ks	Escape
+		</key>
+		<key>
+			key_span_width	1
+			default		ё
+			default_ks	Cyrillic_io
+			shift		Ё
+			shift_ks	Cyrillic_IO
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		1
+			default_ks	1
+			shift		!
+			shift_ks	exclam
+		</key>
+		<key>
+			key_span_width	1
+			bg		248:216:196
+			default		2
+			default_ks	2
+			shift		"
+			shift_ks	quotedbl
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		3
+			default_ks	3
+			shift		№
+			shift_ks	numerosign
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		4
+			default_ks	4
+			shift		;
+			shift_ks	semicolon
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		5
+			default_ks	5
+			shift		%
+			shift_ks	percent
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		6
+			default_ks	6
+			shift		:
+			shift_ks	colon
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		7
+			default_ks	7
+			shift		?
+			shift_ks	question
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		8
+			default_ks	8
+			shift		*
+			shift_ks	asterisk
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		9
+			default_ks	9
+			shift		(
+			shift_ks	parenleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		0
+			default_ks	0
+			shift		)
+			shift_ks	parenright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		-
+			default_ks	minus
+			shift		_
+			shift_ks	underscore
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		= 
+			default_ks	equal
+			shift		+
+			shift_ks	plus
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+#			img		/usr/share/xkbd/img/backspace.xpm
+			default		<-
+			default_ks	BackSpace
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		Tab
+			default_ks	Tab
+		</key>
+		<key>
+			key_span_width	1
+			default		й
+			default_ks	Cyrillic_shorti
+			shift		Й
+			shift_ks	Cyrillic_SHORTI
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ц
+			default_ks	Cyrillic_tse
+			shift		Ц
+			shift_ks	Cyrillic_TSE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		у
+			default_ks	Cyrillic_u
+			shift		У
+			shift_ks	Cyrillic_U
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		к
+			default_ks	Cyrillic_ka
+			shift		К
+			shift_ks	Cyrillic_KA
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		е
+			default_ks	Cyrillic_ie
+			shift		Е
+			shift_ks	Cyrillic_IE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		н
+			default_ks	Cyrillic_en
+			shift		Н
+			shift_ks	Cyrillic_EN
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		г
+			default_ks	Cyrillic_ghe
+			shift		Г
+			shift_ks	Cyrillic_GHE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ш
+			default_ks	Cyrillic_sha
+			shift		Ш
+			shift_ks	Cyrillic_SHA
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		щ
+			default_ks	Cyrillic_shcha
+			shift		Щ
+			shift_ks	Cyrillic_SHCHA
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		з
+			default_ks	Cyrillic_ze
+			shift		З
+			shift_ks	Cyrillic_ZE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		х
+			default_ks	Cyrillic_ha
+			shift		Х
+			shift_ks	Cyrillic_HA
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ъ
+			default_ks	Cyrillic_hardsign
+			shift		Ъ
+			shift_ks	Cyrillic_HARDSIGN
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		\
+			default_ks	backslash
+			shift		|
+			shift_ks	bar
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		CAP
+			default_ks	Caps_Lock
+		</key>
+		<key>
+			key_span_width	1
+			default		ф
+			default_ks	Cyrillic_ef
+			shift		Ф
+			shift_ks	Cyrillic_EF
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ы
+			default_ks	Cyrillic_yeru
+			shift		Ы
+			shift_ks	Cyrillic_YERU
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		в
+			default_ks	Cyrillic_ve
+			shift		В
+			shift_ks	Cyrillic_VE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		а
+			default_ks	Cyrillic_a
+			shift		А
+			shift_ks	Cyrillic_A
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		п
+			default_ks	Cyrillic_pe
+			shift		П
+			shift_ks	Cyrillic_PE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		р
+			default_ks	Cyrillic_er
+			shift		Р
+			shift_ks	Cyrillic_ER
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		о
+			default_ks	Cyrillic_o
+			shift		О
+			shift_ks	Cyrillic_O
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		л
+			default_ks	Cyrillic_el
+			shift		Л
+			shift_ks	Cyrillic_EL
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		д
+			default_ks	Cyrillic_de
+			shift		Д
+			shift_ks	Cyrillic_DE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ж
+			default_ks	Cyrillic_zhe
+			shift		Ж
+			shift_ks	Cyrillic_ZHE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		э
+			default_ks	Cyrillic_e
+			shift		Э
+			shift_ks	Cyrillic_E
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		Ret
+			default_ks	Return
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		SH
+			default_ks	Shift_L
+		</key>
+		<key>
+			key_span_width	1
+			default		я
+			default_ks	Cyrillic_ya
+			shift		Я
+			shift_ks	Cyrillic_YA
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ч
+			default_ks	Cyrillic_che
+			shift		Ч
+			shift_ks	Cyrillic_CHE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		с
+			default_ks	Cyrillic_es
+			shift		С
+			shift_ks	Cyrillic_ES
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		м
+			default_ks	Cyrillic_em
+			shift		М
+			shift_ks	Cyrillic_EM
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		и
+			default_ks	Cyrillic_i
+			shift		И
+			shift_ks	Cyrillic_I
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		т
+			default_ks	Cyrillic_te
+			shift		Т
+			shift_ks	Cyrillic_TE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ь
+			default_ks	Cyrillic_softsign
+			shift		Ь
+			shift_ks	Cyrillic_SOFTSIGN
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		б
+			default_ks	Cyrillic_be
+			shift		Б
+			shift_ks	Cyrillic_BE
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		ю
+			default_ks	Cyrillic_yu
+			shift		Ю
+			shift_ks	Cyrillic_YU
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		.
+			default_ks	period
+			shift		,
+			shift_ks	comma
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		SH
+			default_ks	Shift_R
+		</key>
+	</row>
+	<row>
+		<key>
+			bg 		196:216:248
+			default		Ctrl
+			default_ks	Control_L
+		</key>
+		<key>
+			bg		255:255:255
+			default		EN
+			switch		0
+		</key>
+		<key>
+			bg		255:255:255
+			default		123
+			switch		2
+		</key>
+		<key>
+			bg		200:200:200
+			default_ks	space
+			width		60
+		</key>
+		<key>
+			bg 		196:216:248
+			default		Alt
+			default_ks	Alt_L
+		</key>
+		<key>
+			bg 		255:255:255
+	    		default		<
+	    		default_ks	Left
+		</key>
+		<key>
+			bg 		255:255:255
+			default		>
+			default_ks	Right
+		</key>
+		<key>
+			bg 		255:255:255
+			default		^
+			default_ks	Up
+		</key>
+		<key>
+			bg 		255:255:255
+			default		v
+			default_ks	Down
+		</key>		
+	</row>
+</layout>
+#[ ] ; :  1 2 3  + @ ± $ <-
+#{ } , .  4 5 6  - # _ € Tab
+#( ) ' "  7 8 9  * % ° ₤ Space
+#< > \ |  ^ 0 =  / & № ₣ Reurn
+#  English    Russian  <>^v
+<layout>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		[
+			default_ks	bracketleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		]
+			default_ks	bracketright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		;
+			default_ks	semicolon
+		</key>
+		<key>
+			key_span_width	1
+			bg		248:255:196
+			default		:
+			default_ks	colon
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		$
+			default_ks	dollar
+		</key>
+
+		<key>
+			width		1
+		</key>
+
+		<key>
+			key_span_width	1
+			default		1
+			default_ks	1
+		</key>
+		<key>
+			key_span_width	1
+			default		2
+			default_ks	2
+		</key>
+		<key>
+			key_span_width	1
+			default		3
+			default_ks	3
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		+
+			default_ks	plus
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		@
+			default_ks	at
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		±
+			default_ks	plusminus
+		</key>
+		
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		®
+			default_ks	registered
+		</key>
+		<key>
+			bg		196:216:248
+			key_span_width	1
+#			img		/usr/share/xkbd/img/backspace.xpm
+			default 	<-
+			default_ks	BackSpace
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		{
+			default_ks	braceleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		}
+			default_ks	braceright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		,
+			default_ks	comma
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		.
+			default_ks	period
+			default_ks	period
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		€
+			default_ks	EuroSign
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			key_span_width	1
+			default		4
+			default_ks	4
+		</key>
+		<key>
+			key_span_width	1
+			default		5
+			default_ks	5
+		</key>
+		<key>
+			key_span_width	1
+			default		6
+			default_ks	6
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		-
+			default_ks	minus
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		#
+			default_ks	numbersign
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		_
+			default_ks	underscore
+		</key>
+		
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		©
+			default_ks	copyright
+		</key>
+		<key>
+			bg		196:216:248
+			key_span_width	1
+			default		Esc
+			default_ks	Escape
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		(
+			default_ks	parenleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		)
+			default_ks	parenright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		'
+			default_ks	quoteright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		"
+			default_ks	quotedbl
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		₤
+			default_ks	sterling
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			key_span_width	1
+			default		7
+			default_ks	7
+		</key>
+		<key>
+			key_span_width	1
+			default		8
+			default_ks	8
+		</key>
+		<key>
+			key_span_width	1
+			default		9
+			default_ks	9
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		*
+			default_ks	asterisk
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		%
+			default_ks	percent
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		°
+			default_ks	degree
+		</key>
+				
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		¤
+			default_ks	currency
+		</key>
+		<key>
+			bg		196:216:248
+			key_span_width	1
+			default		Ret
+			default_ks	Return
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		<
+			default_ks	less
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		>
+			default_ks	greater
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		\
+			default_ks	backslash
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		|
+			default_ks	bar
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		¥
+			default_ks	yen
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		^
+			default_ks	asciicircum
+		</key>
+		<key>
+			key_span_width	1
+			default		0
+			default_ks	0
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		=
+			default_ks	equal
+		</key>
+		<key>
+			width		1
+		</key>
+		<key>
+			bg 		248:216:196
+			key_span_width	1
+			default		/
+			default_ks	slash
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		&
+			default_ks	ampersand
+		</key>		
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		№
+			default_ks	numerosign
+		</key>
+		<key>
+			bg 		248:255:196
+			key_span_width	1
+			default		™
+			default_ks	trademark
+		</key>
+
+
+
+		<key>
+			bg		200:200:200
+			key_span_width	1
+			default		Spc
+			default_ks	space
+		</key>
+	</row>
+	<row>
+		<key>
+			bg 		255:255:255
+			default     English
+			switch	    0
+		</key>
+		<key>
+			bg 		255:255:255
+			default     Russian
+			switch	    1
+		</key>
+		<key>
+			bg 		255:255:255
+			default		<
+			default_ks	Left
+		</key>
+		<key>
+			bg 		255:255:255
+			default		>
+			default_ks	Right
+		</key>
+		<key>
+			bg 		255:255:255
+			default		^
+			default_ks	Up
+		</key>
+		<key>
+			bg 		255:255:255
+			default		v
+			default_ks	Down
+		</key>		
+	</row>
+</layout>
diff --git a/packages/xkbd/xkbd-layout-ru_0.1.1.bb b/packages/xkbd/xkbd-layout-ru_0.1.1.bb
index e65d91b7c0..53fbb3c7aa 100644
--- a/packages/xkbd/xkbd-layout-ru_0.1.1.bb
+++ b/packages/xkbd/xkbd-layout-ru_0.1.1.bb
@@ -3,16 +3,16 @@ SECTION = "x11"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
-PR = "r0"
+PR = "r1"
 RDEPENDS = "xkbd"
 
-SRC_URI = "http://whitenoise.ssrlab.com/pda/xkbd/xkbd-ru-en-123_0.1.1.tar.gz" 
+#SRC_URI = "http://whitenoise.ssrlab.com/pda/xkbd/xkbd-ru-en-123_0.1.1.tar.gz" 
+SRC_URI = "file://en-ru-123.xkbd"
 
 S = "${WORKDIR}"
 
 do_install () { 
         install -d ${D}${prefix}/share/xkbd
-	cd usr/share/xkbd/
         for i in *.xkbd; do 
                 install -m 644 $i ${D}${prefix}/share/xkbd/${i} 
         done 
diff --git a/packages/xkbd/xkbd_0.8.15.bb b/packages/xkbd/xkbd_0.8.15.bb
index 2d070fd7ad..cd41bc68f1 100644
--- a/packages/xkbd/xkbd_0.8.15.bb
+++ b/packages/xkbd/xkbd_0.8.15.bb
@@ -2,9 +2,11 @@ SRC_URI = "http://handhelds.org/~mallum/xkbd/xkbd-${PV}-CVS.tar.gz \
            file://libtool-lossage.patch;patch=1;pnum=1 \
 	   file://fix-equalsign.patch;patch=1 \
 	   file://fix-circumkey.patch;patch=1 \
+	   file://add-default-common-slides.patch;patch=1 \
+	   file://differentiate-desktop-name.patch;patch=1 \
 	   file://xkbd.png"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r4"
 
 SECTION = "x11"
 DEPENDS = "libxpm libxtst libxft"
diff --git a/packages/xorg-driver/xf86-video-ati_6.7.196.bb b/packages/xorg-driver/xf86-video-ati_6.7.196.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ati_6.7.196.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-vmware_10.15.2.bb b/packages/xorg-driver/xf86-video-vmware_10.15.2.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-vmware_10.15.2.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-driver/xf86-video-xgi_1.5.0.bb b/packages/xorg-driver/xf86-video-xgi_1.5.0.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-xgi_1.5.0.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/packages/xorg-lib/libx11-native_1.0.3.bb b/packages/xorg-lib/libx11-native_1.0.3.bb
new file mode 100644
index 0000000000..d9e0d05844
--- /dev/null
+++ b/packages/xorg-lib/libx11-native_1.0.3.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+PE = "1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+XORG_PN = "libX11"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+		oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	)
+	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
diff --git a/packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch b/packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch
new file mode 100644
index 0000000000..8fc8ff46b9
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/00-xglamo-logs.patch
@@ -0,0 +1,386 @@
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am	2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am	2007-11-28 18:44:28.000000000 +0100
+@@ -20,6 +20,7 @@
+ noinst_LIBRARIES = libglamo.a
+ 
+ libglamo_a_SOURCES = 	\
++	glamo-log.h	\
+ 	glamo_dma.c	\
+ 	glamo_dma.h	\
+ 	glamo_draw.c	\
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo-log.h	2007-11-29 09:05:53.000000000 +0100
+@@ -0,0 +1,63 @@
++/*
++ * Copyright © 2007 OpenMoko, Inc.
++ *
++ * This driver is based on Xati,
++ * Copyright © 2004 Eric Anholt
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that copyright
++ * notice and this permission notice appear in supporting documentation, and
++ * that the name of the copyright holders not be used in advertising or
++ * publicity pertaining to distribution of the software without specific,
++ * written prior permission.  The copyright holders make no representations
++ * about the suitability of this software for any purpose.  It is provided "as
++ * is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++ * OF THIS SOFTWARE.
++ *
++ * Author: Dodji Seketeli <dodji@openedhand.com>
++ */
++#ifndef _GLAMO_LOG_H_
++#define _GLAMO_LOG_H_
++#ifdef HAVE_CONFIG_H
++#include <kdrive-config.h>
++#endif
++
++#include <assert.h>
++#include "os.h"
++
++#ifdef NDEBUG
++/*we are not in debug mode*/
++#define GLAMO_LOG
++#define GLAMO_LOG_ERROR
++
++#else /*NDEBUG*/
++
++#define ERROR_LOG_LEVEL 3
++#define INFO_LOG_LEVEL 4
++
++#ifndef GLAMO_LOG
++#define GLAMO_LOG(...) \
++LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\
++               __FILE__, __LINE__, __func__) ; \
++LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__)
++#endif /*GLAMO_LOG*/
++
++#ifndef GLAMO_LOG_ERROR
++#define GLAMO_LOG_ERROR(...) \
++LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\
++               __FILE__, __LINE__, __func__) ; \
++LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__)
++#endif /*GLAMO_LOG_ERROR*/
++
++#endif /*NDEBUG*/
++
++#endif /*_GLAMO_LOG_H_*/
++
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c	2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c	2007-11-29 09:33:11.000000000 +0100
+@@ -26,6 +26,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <kdrive-config.h>
+ #endif
++#include "glamo-log.h"
+ #include "glamo.h"
+ #include "glamo-regs.h"
+ #include "glamo_dma.h"
+@@ -90,45 +91,11 @@
+ 	KdScreenPriv(pScreen);
+ 	GLAMOScreenInfo(pScreenPriv);
+ 
+-	ENTER_DRAW(0);
++	GLAMO_LOG("enter");
+ 	GLAMOWaitIdle(glamos);
+-	LEAVE_DRAW(0);
++	GLAMO_LOG("leave");
+ }
+ 
+-#if GLAMO_TRACE_DRAW
+-void
+-GLAMOEnterDraw (PixmapPtr pPix, const char *function)
+-{
+-    if (pPix != NULL) {
+-	KdScreenPriv(pPix->drawable.pScreen);
+-	CARD32 offset;
+-
+-	offset = ((CARD8 *)pPix->devPrivate.ptr -
+-		  pScreenPriv->screen->memory_base);
+-
+-	ErrorF ("Enter %s 0x%x (%dx%dx%d/%d)\n", function, (unsigned int) offset,
+-	    pPix->drawable.width, pPix->drawable.height, pPix->drawable.depth,
+-	    (unsigned int) pPix->drawable.bitsPerPixel);
+-    } else
+-	ErrorF ("Enter %s\n", function);
+-}
+-
+-void
+-GLAMOLeaveDraw (PixmapPtr pPix, const char *function)
+-{
+-    if (pPix != NULL) {
+-	KdScreenPriv(pPix->drawable.pScreen);
+-	CARD32 offset;
+-
+-	offset = ((CARD8 *)pPix->devPrivate.ptr -
+-		  pScreenPriv->screen->memory_base);
+-
+-	ErrorF ("Leave %s 0x%x\n", function, (unsigned int) offset);
+-    } else
+-	ErrorF ("Leave %s\n", function);
+-}
+-#endif
+-
+ static Bool
+ GLAMOPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
+ {
+@@ -152,7 +119,7 @@
+ 			pScreenPriv->screen->memory_base);
+ 	pitch = pPix->devKind;
+ 
+-	ENTER_DRAW(pPix);
++	GLAMO_LOG("enter");
+ 
+ 	BEGIN_DMA(12);
+ 	OUT_REG(GLAMO_REG_2D_DST_ADDRL, offset & 0xffff);
+@@ -163,7 +130,7 @@
+ 	OUT_REG(GLAMO_REG_2D_COMMAND2, settings);
+ 	END_DMA();
+ 
+-	LEAVE_DRAW(pPix);
++	GLAMO_LOG("leave");
+ 
+ 	return TRUE;
+ }
+@@ -171,7 +138,7 @@
+ static void
+ GLAMOSolid(int x1, int y1, int x2, int y2)
+ {
+-	ENTER_DRAW(0);
++	GLAMO_LOG("enter");
+ 	GLAMOScreenInfo *glamos = accel_glamos;
+ 	RING_LOCALS;
+ 
+@@ -184,14 +151,12 @@
+ 	OUT_REG(GLAMO_REG_2D_ID1, 0);
+ 	OUT_REG(GLAMO_REG_2D_ID2, 0);
+ 	END_DMA();
+-	LEAVE_DRAW(0);
++	GLAMO_LOG("leave");
+ }
+ 
+ static void
+ GLAMODoneSolid(void)
+ {
+-	ENTER_DRAW(0);
+-	LEAVE_DRAW(0);
+ }
+ 
+ static Bool
+@@ -204,6 +169,8 @@
+ 	FbBits mask;
+ 	RING_LOCALS;
+ 
++	GLAMO_LOG("enter");
++
+ 	if (pSrc->drawable.bitsPerPixel != 16 ||
+ 	    pDst->drawable.bitsPerPixel != 16)
+ 		GLAMO_FALLBACK(("Only 16bpp is supported"));
+@@ -224,8 +191,6 @@
+ 
+ 	settings = GLAMOBltRop[alu] << 8;
+ 
+-	ENTER_DRAW (pDst);
+-
+ 	BEGIN_DMA(16);
+ 
+ 	OUT_REG(GLAMO_REG_2D_SRC_ADDRL, src_offset & 0xffff);
+@@ -241,7 +206,7 @@
+ 
+ 	END_DMA();
+ 
+-	LEAVE_DRAW(pDst);
++	GLAMO_LOG("leave");
+ 
+ 	return TRUE;
+ }
+@@ -268,8 +233,10 @@
+ static void
+ GLAMODoneCopy(void)
+ {
+-	ENTER_DRAW(0);
+-	LEAVE_DRAW(0);
++	GLAMOScreenInfo *glamos = accel_glamos;
++	GLAMO_LOG("enter");
++        GLAMOFlushIndirect(glamos, 1);
++	GLAMO_LOG("leave");
+ }
+ 
+ static Bool
+@@ -279,6 +246,7 @@
+ 	CARD8 *dst_offset;
+ 	int dst_pitch;
+ 
++        GLAMO_LOG("enter");
+ 	dst_offset = (CARD8 *)pDst->devPrivate.ptr;
+ 	dst_pitch = pDst->devKind;
+ 	width = pDst->drawable.width;
+@@ -294,83 +262,9 @@
+ 		src += src_pitch;
+ 	}
+ 
+-	ErrorF("hostdata upload %d,%d %dbpp\n", width, height, bpp);
+-
+ 	return TRUE;
+ }
+ 
+-
+-#if 0
+-static Bool
+-GLAMOUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst)
+-{
+-	KdScreenPriv(pSrc->drawable.pScreen);
+-	GLAMOCardInfo(pScreenPriv);
+-	GLAMOScreenInfo(pScreenPriv);
+-	int dst_pitch, src_pitch, w, i, size, bytes;
+-	unsigned char *dst, *src;
+-	RING_LOCALS;
+-
+-	ENTER_DRAW(pSrc);
+-	/* Align width to log 2, useful for R128 composite.  This should be a
+-	 * KAA flag we check for (and supported in kaa.c in general) since many
+-	 * older bits of hardware are going to want POT pitches.
+-	 */
+-	w = pSrc->drawable.width;
+-	if (glamos->kaa.flags & KAA_OFFSCREEN_ALIGN_POT)
+-		w = 1 << (GLAMOLog2(w - 1) + 1);
+-	dst_pitch = (w * pSrc->drawable.bitsPerPixel / 8 +
+-	    glamos->kaa.pitchAlign - 1) & ~(glamos->kaa.pitchAlign - 1);
+-
+-	size = dst_pitch * pSrc->drawable.height;
+-	if (size > glamos->scratch_area->size)
+-		GLAMO_FALLBACK(("Pixmap too large for scratch (%d,%d)\n",
+-		    pSrc->drawable.width, pSrc->drawable.height));
+-
+-	glamos->scratch_next = (glamos->scratch_next + glamos->kaa.offsetAlign - 1) &
+-	    ~(glamos->kaa.offsetAlign - 1);
+-	if (glamos->scratch_next + size > glamos->scratch_area->offset +
+-	    glamos->scratch_area->size) {
+-		/* Only sync when we've used all of the scratch area. */
+-		kaaWaitSync(pSrc->drawable.pScreen);
+-		glamos->scratch_next = glamos->scratch_area->offset;
+-	}
+-	memcpy(pDst, pSrc, sizeof(*pDst));
+-	pDst->devKind = dst_pitch;
+-	pDst->devPrivate.ptr = pScreenPriv->screen->memory_base +
+-	    glamos->scratch_next;
+-	glamos->scratch_next += size;
+-
+-	src = pSrc->devPrivate.ptr;
+-	src_pitch = pSrc->devKind;
+-	dst = pDst->devPrivate.ptr;
+-	bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
+-
+-	i = pSrc->drawable.height;
+-	while (i--) {
+-		memcpy(dst, src, bytes);
+-		dst += dst_pitch;
+-		src += src_pitch;
+-	}
+-
+-	/* Flush the pixel cache */
+-	if (glamoc->is_3362) {
+-		BEGIN_DMA(4);
+-		OUT_REG(RADEON_REG_RB3D_DSTCACHE_CTLSTAT,
+-		    RADEON_RB3D_DC_FLUSH_ALL);
+-		OUT_REG(GLAMO_REG_WAIT_UNTIL, RADEON_WAIT_HOST_IDLECLEAN);
+-		END_DMA();
+-	} else {
+-		BEGIN_DMA(2);
+-		OUT_REG(R128_REG_PC_GUI_CTLSTAT, R128_PC_FLUSH_ALL);
+-		END_DMA();
+-	}
+-
+-	LEAVE_DRAW(pSrc);
+-	return TRUE;
+-}
+-#endif
+-
+ static void
+ GLAMOBlockHandler(pointer blockData, OSTimePtr timeout, pointer readmask)
+ {
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_dma.c	2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c	2007-11-28 22:13:23.000000000 +0100
+@@ -25,6 +25,7 @@
+ 
+ #include <sys/time.h>
+ 
++#include "glamo-log.h"
+ #include "glamo.h"
+ #include "glamo-regs.h"
+ #include "glamo_dma.h"
+@@ -35,9 +36,7 @@
+ #include "glamo_sarea.h"
+ #endif /* USE_DRI */
+ 
+-#define DEBUG_FIFO 1
+-
+-#if DEBUG_FIFO
++#ifndef NDEBUG
+ static void
+ GLAMODebugFifo(GLAMOScreenInfo *glamos)
+ {
+@@ -273,7 +272,7 @@
+ 		count--;
+ 	}
+ 	if (TIMEDOUT()) {
+-		ErrorF("Timeout submitting packets, resetting...\n");
++		GLAMO_LOG_ERROR("Timeout submitting packets, resetting...\n");
+ 		GLAMOEngineReset(glamos->screen->pScreen, GLAMO_ENGINE_CQ);
+ 		GLAMODrawSetup(glamos->screen->pScreen);
+ 	}
+@@ -292,11 +291,6 @@
+ 	if ((glamos->indirectStart == buf->used) && !discard)
+ 		return;
+ 
+-#if DEBUG_FIFO
+-	ErrorF("Dispatching %d DWORDS\n", (buf->used - glamos->indirectStart) /
+-	    4);
+-#endif
+-
+ #ifdef USE_DRI
+ 	if (glamos->using_dri) {
+ 		buf->drmBuf->used = buf->used;
+@@ -384,11 +378,6 @@
+ 	glamos->indirectBuffer = GLAMOGetDMABuffer(glamos);
+ 	if (glamos->indirectBuffer == FALSE)
+ 		FatalError("Failed to allocate DMA buffer.\n");
+-
+-	if (glamos->using_dri)
+-		ErrorF("Initialized DRI DMA\n");
+-	else
+-		ErrorF("Initialized DMA\n");
+ }
+ 
+ void
+Index: xorg-server-1.3.0.0/configure.ac
+===================================================================
+--- xorg-server-1.3.0.0.orig/configure.ac	2007-11-29 09:07:21.000000000 +0100
++++ xorg-server-1.3.0.0/configure.ac	2007-11-29 09:15:38.000000000 +0100
+@@ -866,6 +866,10 @@
+ 
+ if ! test "x$DEBUGGING" = xyes; then
+   AC_DEFINE(NDEBUG, 1, [Disable some debugging code])
++  AC_MSG_NOTICE([disabled debugging])
++else
++  AC_MSG_NOTICE([enabled debugging])
++
+ fi
+ 
+ AC_DEFINE(USE_RGB_TXT, 1, [Use rgb.txt directly])
diff --git a/packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch b/packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch
new file mode 100644
index 0000000000..1ca96b954d
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/01-xglamo-scrolling-artifact-fix.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c	2007-11-30 09:54:00.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c	2007-11-30 09:55:05.000000000 +0100
+@@ -314,8 +314,8 @@
+ 	 */
+ 
+ 	glamos->kaa.flags = KAA_OFFSCREEN_PIXMAPS;
+-	glamos->kaa.offsetAlign = 2;
+-	glamos->kaa.pitchAlign = 2;
++	glamos->kaa.offsetAlign = 0;
++	glamos->kaa.pitchAlign = 0;
+ 
+ 	kaaInitTrapOffsets(8, sample_offsets_x, sample_offsets_y, 0.0, 0.0);
+ 	sample_count = (1 << 8) - 1;
diff --git a/packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch b/packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch
new file mode 100644
index 0000000000..43315121da
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/02-xglamo-no-dri.patch
@@ -0,0 +1,438 @@
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.c	2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c	2007-11-30 10:18:43.000000000 +0100
+@@ -27,9 +27,6 @@
+ #include <kdrive-config.h>
+ #endif
+ #include "glamo.h"
+-#if defined(USE_DRI) && defined(GLXEXT)
+-#include "glamo_sarea.h"
+-#endif
+ 
+ static Bool
+ GLAMOCardInit(KdCardInfo *card)
+@@ -89,13 +86,6 @@
+ 		return FALSE;
+ 	}
+ 
+-#ifdef USE_DRI
+-	/* We demand identification by busid, not driver name */
+-	glamoc->drmFd = drmOpen(NULL, glamoc->busid);
+-	if (glamoc->drmFd < 0)
+-		ErrorF("Failed to open DRM, DRI disabled.\n");
+-#endif /* USE_DRI */
+-
+ 	card->driver = glamoc;
+ 
+ 	glamoc->is_3362 = TRUE;
+@@ -122,10 +112,6 @@
+ GLAMOSetOffscreen (KdScreenInfo *screen)
+ {
+ 	GLAMOCardInfo(screen);
+-#if defined(USE_DRI) && defined(GLXEXT)
+-	GLAMOScreenInfo *glamos = (GLAMOScreenInfo *)screen->driver;
+-	int l;
+-#endif
+ 	int screen_size;
+ 	char *mmio = glamoc->reg_base;
+ 
+@@ -152,57 +138,7 @@
+ 	}
+ 
+ 	screen_size = screen->fb[0].byteStride * screen->height;
+-
+ 	screen->off_screen_base = screen_size;
+-
+-#if defined(USE_DRI) && defined(GLXEXT)
+-	/* Reserve a static area for the back buffer the same size as the
+-	 * visible screen.  XXX: This would be better initialized in glamo_dri.c
+-	 * when GLX is set up, but the offscreen memory manager's allocations
+-	 * don't last through VT switches, while the kernel's understanding of
+-	 * offscreen locations does.
+-	 */
+-	glamos->frontOffset = 0;
+-	glamos->frontPitch = screen->fb[0].byteStride;
+-
+-	if (screen->off_screen_base + screen_size <= screen->memory_size) {
+-		glamos->backOffset = screen->off_screen_base;
+-		glamos->backPitch = screen->fb[0].byteStride;
+-		screen->off_screen_base += screen_size;
+-	}
+-
+-	/* Reserve the depth span for Rage 128 */
+-	if (!glamoc->is_3362 && screen->off_screen_base +
+-	    screen->fb[0].byteStride <= screen->memory_size) {
+-		glamos->spanOffset = screen->off_screen_base;
+-		screen->off_screen_base += screen->fb[0].byteStride;
+-	}
+-
+-	/* Reserve the static depth buffer, which happens to be the same
+-	 * bitsPerPixel as the screen.
+-	 */
+-	if (screen->off_screen_base + screen_size <= screen->memory_size) {
+-		glamos->depthOffset = screen->off_screen_base;
+-		glamos->depthPitch = screen->fb[0].byteStride;
+-		screen->off_screen_base += screen_size;
+-	}
+-
+-	/* Reserve approx. half of remaining offscreen memory for local
+-	 * textures.  Round down to a whole number of texture regions.
+-	 */
+-	glamos->textureSize = (screen->memory_size - screen->off_screen_base) / 2;
+-	l = GLAMOLog2(glamos->textureSize / GLAMO_NR_TEX_REGIONS);
+-	if (l < GLAMO_LOG_TEX_GRANULARITY)
+-		l = GLAMO_LOG_TEX_GRANULARITY;
+-	glamos->textureSize = (glamos->textureSize >> l) << l;
+-	if (glamos->textureSize >= 512 * 1024) {
+-		glamos->textureOffset = screen->off_screen_base;
+-		screen->off_screen_base += glamos->textureSize;
+-	} else {
+-		/* Minimum texture size is for 2 256x256x32bpp textures */
+-		glamos->textureSize = 0;
+-	}
+-#endif /* USE_DRI && GLXEXT */
+ }
+ 
+ static Bool
+@@ -413,9 +349,6 @@
+ GLAMODisable(ScreenPtr pScreen)
+ {
+ 	KdScreenPriv(pScreen);
+-#if defined(USE_DRI) && defined(GLXEXT)
+-	GLAMOScreenInfo(pScreenPriv);
+-#endif /* USE_DRI && GLXEXT */
+ 	GLAMOCardInfo(pScreenPriv);
+ 
+ 	GLAMOUnmapReg(pScreenPriv->card, glamoc);
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_dma.c	2007-11-28 22:13:23.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_dma.c	2007-11-30 10:25:49.000000000 +0100
+@@ -31,11 +31,6 @@
+ #include "glamo_dma.h"
+ #include "glamo_draw.h"
+ 
+-#ifdef USE_DRI
+-#include "radeon_common.h"
+-#include "glamo_sarea.h"
+-#endif /* USE_DRI */
+-
+ #ifndef NDEBUG
+ static void
+ GLAMODebugFifo(GLAMOScreenInfo *glamos)
+@@ -168,26 +163,6 @@
+ 	if (glamos->indirectBuffer != NULL)
+ 		GLAMOFlushIndirect(glamos, 0);
+ 
+-#ifdef USE_DRI
+-	if (glamos->using_dri) {
+-		int ret = 0;
+-		int cmd = (glamoc->is_3362 ? DRM_RADEON_CP_IDLE :
+-		    DRM_R128_CCE_IDLE);
+-		WHILE_NOT_TIMEOUT(2) {
+-			ret = drmCommandNone(glamoc->drmFd, cmd);
+-			if (ret != -EBUSY)
+-				break;
+-		}
+-		if (TIMEDOUT()) {
+-			GLAMODebugFifo(glamos);
+-			FatalError("Timed out idling CCE (card hung)\n");
+-		}
+-		if (ret != 0)
+-			ErrorF("Failed to idle DMA, returned %d\n", ret);
+-		return;
+-	}
+-#endif
+-
+ 	WHILE_NOT_TIMEOUT(.5) {
+ 		status = MMIO_IN16(mmio, GLAMO_REG_CQ_STATUS);
+ 		if ((status & (1 << 2)) && !(status & (1 << 8)))
+@@ -214,20 +189,6 @@
+ 	if (buf == NULL)
+ 		return NULL;
+ 
+-#ifdef USE_DRI
+-	if (glamos->using_dri) {
+-		buf->drmBuf = GLAMODRIGetBuffer(glamos);
+-		if (buf->drmBuf == NULL) {
+-			xfree(buf);
+-			return NULL;
+-		}
+-		buf->size = buf->drmBuf->total;
+-		buf->used = buf->drmBuf->used;
+-		buf->address = buf->drmBuf->address;
+-		return buf;
+-	}
+-#endif /* USE_DRI */
+-
+ 	buf->size = glamos->ring_len / 2;
+ 	buf->address = xalloc(buf->size);
+ 	if (buf->address == NULL) {
+@@ -290,25 +251,6 @@
+ 
+ 	if ((glamos->indirectStart == buf->used) && !discard)
+ 		return;
+-
+-#ifdef USE_DRI
+-	if (glamos->using_dri) {
+-		buf->drmBuf->used = buf->used;
+-		GLAMODRIDispatchIndirect(glamos, discard);
+-		if (discard) {
+-			buf->drmBuf = GLAMODRIGetBuffer(glamos);
+-			buf->size = buf->drmBuf->total;
+-			buf->used = buf->drmBuf->used;
+-			buf->address = buf->drmBuf->address;
+-			glamos->indirectStart = 0;
+-		} else {
+-			/* Start on a double word boundary */
+-			glamos->indirectStart = buf->used = (buf->used + 7) & ~7;
+-		}
+-		return;
+-	}
+-#endif /* USE_DRI */
+-
+ 	GLAMODispatchIndirectDMA(glamos);
+ 
+ 	buf->used = 0;
+@@ -367,13 +309,7 @@
+ 	KdScreenPriv(pScreen);
+ 	GLAMOScreenInfo(pScreenPriv);
+ 
+-#ifdef USE_DRI
+-	if (glamos->using_dri)
+-		GLAMODRIDMAStart(glamos);
+-#endif /* USE_DRI */
+-
+-	if (!glamos->using_dri)
+-		GLAMODMAInit(pScreen);
++	GLAMODMAInit(pScreen);
+ 
+ 	glamos->indirectBuffer = GLAMOGetDMABuffer(glamos);
+ 	if (glamos->indirectBuffer == FALSE)
+@@ -388,11 +324,6 @@
+ 
+ 	GLAMOWaitIdle(glamos);
+ 
+-#ifdef USE_DRI
+-	if (glamos->using_dri)
+-		GLAMODRIDMAStop(glamos);
+-#endif /* USE_DRI */
+-
+ 	xfree(glamos->indirectBuffer->address);
+ 	xfree(glamos->indirectBuffer);
+ 	glamos->indirectBuffer = NULL;
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.h	2007-11-30 10:24:13.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h	2007-11-30 10:25:06.000000000 +0100
+@@ -39,18 +39,6 @@
+ 
+ #include "kxv.h"
+ 
+-#undef XF86DRI
+-#ifdef XF86DRI
+-#define USE_DRI
+-#include "xf86drm.h"
+-#include "dri.h"
+-#ifdef GLXEXT
+-#include "GL/glxint.h"
+-#include "GL/glxtokens.h"
+-#include "glamo_dripriv.h"
+-#endif
+-#endif
+-
+ #define GLAMO_REG_BASE(c)		((c)->attr.address[0])
+ #define GLAMO_REG_SIZE(c)		(0x2400)
+ 
+@@ -124,9 +112,6 @@
+ 	Bool is_3362;
+ 	CARD32 crtc_pitch;
+ 	CARD32 crtc2_pitch;
+-#ifdef USE_DRI
+-	int drmFd;
+-#endif /* USE_DRI */
+ 	Bool use_fbdev, use_vesa;
+ } GLAMOCardInfo;
+ 
+@@ -166,9 +151,6 @@
+ 	int size;
+ 	int used;
+ 	void *address;
+-#ifdef USE_DRI
+-	drmBufPtr drmBuf;
+-#endif
+ } dmaBuf;
+ 
+ typedef struct _GLAMOScreenInfo {
+@@ -194,8 +176,6 @@
+ 	KdVideoAdaptorPtr pAdaptor;
+ 	int		num_texture_ports;
+ 
+-	Bool		using_dri;	/* If we use the DRM for DMA. */
+-
+ 	KdOffscreenArea *dma_space;	/* For "DMA" from framebuffer. */
+ 	CARD16		*ring_addr;	/* Beginning of ring buffer. */
+ 	int		ring_write;	/* Index of write ptr in ring. */
+@@ -204,76 +184,6 @@
+ 
+ 	dmaBuf		*indirectBuffer;
+ 	int		indirectStart;
+-
+-#ifdef USE_DRI
+-	Bool		dma_started;
+-
+-	drmSize         registerSize;
+-	drmHandle       registerHandle;
+-	drmHandle       fbHandle;
+-
+-	drmSize		gartSize;
+-	drmHandle	agpMemHandle;		/* Handle from drmAgpAlloc */
+-	unsigned long	gartOffset;
+-	unsigned char	*AGP;			/* Map */
+-	int		agpMode;
+-	drmSize         pciSize;
+-	drmHandle       pciMemHandle;
+-
+-	/* ring buffer data */
+-	unsigned long	ringStart;		/* Offset into AGP space */
+-	drmHandle	ringHandle;		/* Handle from drmAddMap */
+-	drmSize		ringMapSize;		/* Size of map */
+-	int		ringSize;		/* Size of ring (MB) */
+-	unsigned char	*ring;			/* Map */
+-
+-	unsigned long	ringReadOffset;		/* Offset into AGP space */
+-	drmHandle	ringReadPtrHandle;	/* Handle from drmAddMap */
+-	drmSize		ringReadMapSize;	/* Size of map */
+-	unsigned char	*ringReadPtr;		/* Map */
+-
+-	/* vertex/indirect buffer data */
+-	unsigned long	bufStart;		/* Offset into AGP space */
+-	drmHandle	bufHandle;		/* Handle from drmAddMap */
+-	drmSize		bufMapSize;		/* Size of map */
+-	int		bufSize;		/* Size of buffers (MB) */
+-	unsigned char	*buf;			/* Map */
+-	int		bufNumBufs;		/* Number of buffers */
+-	drmBufMapPtr	buffers;		/* Buffer map */
+-
+-	/* AGP Texture data */
+-	unsigned long	gartTexStart;		/* Offset into AGP space */
+-	drmHandle	gartTexHandle;		/* Handle from drmAddMap */
+-	drmSize		gartTexMapSize;		/* Size of map */
+-	int		gartTexSize;		/* Size of AGP tex space (MB) */
+-	unsigned char	*gartTex;		/* Map */
+-	int		log2GARTTexGran;
+-
+-	int		DMAusecTimeout;   /* CCE timeout in usecs */
+-
+-	/* DRI screen private data */
+-	int		frontOffset;
+-	int		frontPitch;
+-	int		backOffset;
+-	int		backPitch;
+-	int		depthOffset;
+-	int		depthPitch;
+-	int		spanOffset;
+-	int		textureOffset;
+-	int		textureSize;
+-	int		log2TexGran;
+-
+-	int		irqEnabled;
+-
+-	int		serverContext;
+-
+-	DRIInfoPtr	pDRIInfo;
+-#ifdef GLXEXT
+-	int		numVisualConfigs;
+-	__GLXvisualConfig *pVisualConfigs;
+-	GLAMOConfigPrivPtr pVisualConfigsPriv;
+-#endif /* GLXEXT */
+-#endif /* USE_DRI */
+ } GLAMOScreenInfo;
+ 
+ #define getGLAMOScreenInfo(kd)	((GLAMOScreenInfo *) ((kd)->screen->driver))
+@@ -330,31 +240,6 @@
+ void
+ GLAMODrawFini(ScreenPtr pScreen);
+ 
+-/* glamo_dri.c */
+-#ifdef USE_DRI
+-Bool
+-GLAMODRIScreenInit(ScreenPtr pScreen);
+-
+-void
+-GLAMODRICloseScreen(ScreenPtr pScreen);
+-
+-void
+-GLAMODRIDMAStart(GLAMOScreenInfo *glamos);
+-
+-void
+-GLAMODRIDMAStop(GLAMOScreenInfo *glamos);
+-
+-void
+-GLAMODRIDMAReset(GLAMOScreenInfo *glamos);
+-
+-void
+-GLAMODRIDispatchIndirect(GLAMOScreenInfo *glamos, Bool discard);
+-
+-drmBufPtr
+-GLAMODRIGetBuffer(GLAMOScreenInfo *glamos);
+-
+-#endif /* USE_DRI */
+-
+ /* glamo_cursor.c */
+ Bool
+ GLAMOCursorInit(ScreenPtr pScreen);
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_draw.c	2007-11-30 09:55:05.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_draw.c	2007-11-30 10:26:02.000000000 +0100
+@@ -296,11 +296,6 @@
+ 	RegisterBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler,
+ 	    pScreen);
+ 
+-	glamos->using_dri = FALSE;
+-#ifdef USE_DRI
+-	glamos->using_dri = GLAMODRIScreenInit(pScreen);
+-#endif /* USE_DRI */
+-
+ 	memset(&glamos->kaa, 0, sizeof(KaaScreenInfoRec));
+ 	glamos->kaa.waitMarker = GLAMOWaitMarker;
+ 	glamos->kaa.PrepareSolid = GLAMOPrepareSolid;
+@@ -357,20 +352,6 @@
+ 	glamos->kaa.UploadToScreen = NULL;
+     	glamos->kaa.UploadToScratch = NULL;
+ 
+-#ifdef USE_DRI
+-	if (glamos->using_dri) {
+-		if (!glamoc->is_3362) {
+-			/*glamos->kaa.PrepareTrapezoids = R128PrepareTrapezoids;
+-			glamos->kaa.Trapezoids = R128Trapezoids;
+-			glamos->kaa.DoneTrapezoids = R128DoneTrapezoids;*/
+-		} else if (glamoc->is_r100 || glamoc->is_r200) {
+-			glamos->kaa.PrepareTrapezoids = RadeonPrepareTrapezoids;
+-			glamos->kaa.Trapezoids = RadeonTrapezoids;
+-			glamos->kaa.DoneTrapezoids = RadeonDoneTrapezoids;
+-		}
+-	}
+-#endif /* USE_DRI */
+-
+ 	glamos->kaa.UploadToScreen = GLAMOUploadToScreen;
+ 
+ 	/* Reserve a scratch area.  It'll be used for storing glyph data during
+@@ -399,15 +380,6 @@
+ void
+ GLAMODrawFini(ScreenPtr pScreen)
+ {
+-#ifdef USE_DRI
+-	KdScreenPriv(pScreen);
+-	GLAMOScreenInfo(pScreenPriv);
+-	if (glamos->using_dri) {
+-		GLAMODRICloseScreen(pScreen);
+-		glamos->using_dri = FALSE;
+-	}
+-#endif /* USE_DRI */
+-
+ 	RemoveBlockAndWakeupHandlers(GLAMOBlockHandler, GLAMOWakeupHandler,
+ 	    pScreen);
+ 
diff --git a/packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch b/packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch
new file mode 100644
index 0000000000..2c44bd8d3d
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/03-xglamo-no-vesa.patch
@@ -0,0 +1,141 @@
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.c	2007-11-30 10:18:43.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.c	2007-11-30 10:35:27.000000000 +0100
+@@ -38,9 +38,7 @@
+ 	if (glamoc == NULL)
+ 		return FALSE;
+ 
+-#ifdef KDRIVEFBDEV
+ 	if (!initialized && fbdevInitialize(card, &glamoc->backend_priv.fbdev)) {
+-		glamoc->use_fbdev = TRUE;
+ 		initialized = TRUE;
+ 		glamoc->backend_funcs.cardfini = fbdevCardFini;
+ 		glamoc->backend_funcs.scrfini = fbdevScreenFini;
+@@ -58,29 +56,6 @@
+ 		glamoc->backend_funcs.randrSetConfig = fbdevRandRSetConfig;
+ #endif
+ 	}
+-#endif
+-#ifdef KDRIVEVESA
+-	if (!initialized && vesaInitialize(card, &glamoc->backend_priv.vesa)) {
+-		glamoc->use_vesa = TRUE;
+-		initialized = TRUE;
+-		glamoc->backend_funcs.cardfini = vesaCardFini;
+-		glamoc->backend_funcs.scrfini = vesaScreenFini;
+-		glamoc->backend_funcs.initScreen = vesaInitScreen;
+-		glamoc->backend_funcs.finishInitScreen = vesaFinishInitScreen;
+-		glamoc->backend_funcs.createRes = vesaCreateResources;
+-		glamoc->backend_funcs.preserve = vesaPreserve;
+-		glamoc->backend_funcs.restore = vesaRestore;
+-		glamoc->backend_funcs.dpms = vesaDPMS;
+-		glamoc->backend_funcs.enable = vesaEnable;
+-		glamoc->backend_funcs.disable = vesaDisable;
+-		glamoc->backend_funcs.getColors = vesaGetColors;
+-		glamoc->backend_funcs.putColors = vesaPutColors;
+-#ifdef RANDR
+-		glamoc->backend_funcs.randrSetConfig = vesaRandRSetConfig;
+-#endif
+-	}
+-#endif
+-
+ 	if (!initialized || !GLAMOMapReg(card, glamoc)) {
+ 		xfree(glamoc);
+ 		return FALSE;
+@@ -158,18 +133,8 @@
+ 
+ 	if (screen->fb[0].depth == 0)
+ 		screen->fb[0].depth = 16;
+-#ifdef KDRIVEFBDEV
+-	if (glamoc->use_fbdev) {
+-		success = fbdevScreenInitialize(screen,
+-						&glamos->backend_priv.fbdev);
+-	}
+-#endif
+-#ifdef KDRIVEVESA
+-	if (glamoc->use_vesa) {
+-		success = vesaScreenInitialize(screen,
+-					       &glamos->backend_priv.vesa);
+-	}
+-#endif
++
++	success = fbdevScreenInitialize(screen, &glamos->backend_priv.fbdev);
+ 
+ 	if (!success) {
+ 		screen->driver = NULL;
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo.h	2007-11-30 10:25:06.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo.h	2007-11-30 10:35:17.000000000 +0100
+@@ -30,13 +30,7 @@
+ #include <kdrive-config.h>
+ #endif
+ 
+-#ifdef KDRIVEFBDEV
+ #include <fbdev.h>
+-#endif
+-#ifdef KDRIVEVESA
+-#include <vesa.h>
+-#endif
+-
+ #include "kxv.h"
+ 
+ #define GLAMO_REG_BASE(c)		((c)->attr.address[0])
+@@ -99,12 +93,7 @@
+ 
+ typedef struct _GLAMOCardInfo {
+ 	union {
+-#ifdef KDRIVEFBDEV
+ 		FbdevPriv fbdev;
+-#endif
+-#ifdef KDRIVEVESA
+-		VesaCardPrivRec vesa;
+-#endif
+ 	} backend_priv;
+ 	struct backend_funcs backend_funcs;
+ 
+@@ -112,7 +101,6 @@
+ 	Bool is_3362;
+ 	CARD32 crtc_pitch;
+ 	CARD32 crtc2_pitch;
+-	Bool use_fbdev, use_vesa;
+ } GLAMOCardInfo;
+ 
+ #define getGLAMOCardInfo(kd)	((GLAMOCardInfo *) ((kd)->card->driver))
+@@ -155,12 +143,7 @@
+ 
+ typedef struct _GLAMOScreenInfo {
+ 	union {
+-#ifdef KDRIVEFBDEV
+ 		FbdevScrPriv fbdev;
+-#endif
+-#ifdef KDRIVEVESA
+-		VesaScreenPrivRec vesa;
+-#endif
+ 	} backend_priv;
+ 	KaaScreenInfoRec kaa;
+ 
+Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c	2007-11-28 18:44:27.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c	2007-11-30 10:34:10.000000000 +0100
+@@ -59,9 +59,6 @@
+ ddxUseMsg (void)
+ {
+ 	KdUseMsg();
+-#ifdef KDRIVEVESA
+-	vesaUseMsg();
+-#endif
+ }
+ 
+ int
+@@ -69,9 +66,6 @@
+ {
+ 	int	ret;
+ 
+-#ifdef KDRIVEVESA
+-	if (!(ret = vesaProcessArgument (argc, argv, i)))
+-#endif
+ 		ret = KdProcessArgument(argc, argv, i);
+ 
+ 	return ret;
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 98dfb0ae67..83ef9ea611 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r22"
+PR = "r21"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -19,11 +19,18 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://w100.patch;patch=1 \
 	file://w100-autofoo.patch;patch=1 \
 	file://w100-fix-offscreen-bmp.patch;patch=1 \
-    file://xorg-avr32-support.diff;patch=1 \
-    file://kdrive-1.3-18bpp.patch;patch=1 \
-    file://gumstix-kmode.patch;patch=1 \
-    file://smedia-glamo.patch;patch=1 \ 
-    file://build-glamo.patch;patch=1 \
+        file://kdrive-1.3-18bpp.patch;patch=1 \
+        file://gumstix-kmode.patch;patch=1 \
+        file://smedia-glamo.patch;patch=1 \
+        file://build-glamo.patch;patch=1 \
+        file://00-xglamo-logs.patch;patch=1 \
+        file://01-xglamo-scrolling-artifact-fix.patch;patch=1 \
+        file://02-xglamo-no-dri.patch;patch=1 \
+        file://03-xglamo-no-vesa.patch;patch=1 \
+"
+
+SRC_URI_append_avr32 = " \
+        file://xorg-avr32-support.diff;patch=1 \
 "
 
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/packages/xserver-common/files/unbreak-simpad.patch b/packages/xserver-common/files/unbreak-simpad.patch
new file mode 100644
index 0000000000..7f557c317d
--- /dev/null
+++ b/packages/xserver-common/files/unbreak-simpad.patch
@@ -0,0 +1,18 @@
+--- xserver-common-1.18/X11/Xinit.d/12keymap.org	2007-08-24 14:14:31.000000000 +0300
++++ xserver-common-1.18/X11/Xinit.d/12keymap	2007-12-22 15:06:52.000000000 +0200
+@@ -15,14 +15,11 @@
+         "Sharp-Collie")
+                 xmodmap - < /etc/X11/collie.xmodmap
+                 ;;
+-	"Simpad")
+-		xmodmap - < /etc/X11/simpad.xmodmap
+-		;;
+ 	"HP iPAQ h6300")
+ 		xmodmap - < /etc/X11/h6300.xmodmap
+ 		;;
+ 	# All the rest of keyboardless PDA machines use common buttonmap
+-	"HP iPAQ"* | "Asus MyPal"*)
++	"Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ 		xmodmap - < /etc/X11/keyboardless.xmodmap
+ 		;;
+ esac
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
index a30a37c893..bf7b049939 100644
--- a/packages/xserver-common/xserver-common_1.18.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
index ac6de5d82e..417b29ca2a 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -114,8 +114,7 @@ case `module_id` in
                      DPI=140
                 fi 
                 ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" 
-                # uncomment the line below if you want to test Xglamo
-		#XSERVER=/usr/bin/Xglamo 
+		XSERVER=/usr/bin/Xglamo 
 		;;
 	"Nokia N770")
                 ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" 
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index f7fe52d84e..d99921ca5d 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -15,6 +15,9 @@ fi
 if [ -f /usr/bin/Xomap ]; then
   XSERVER=/usr/bin/Xomap
 fi
+if [ -f /usr/bin/Xglamo ]; then
+  XSERVER=/usr/bin/Xglamo
+fi
 
 . /etc/profile
 
@@ -115,4 +118,4 @@ fi
 
 DISPLAY=':0'
 
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* >/tmp/x.log 2>&1
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index db50c6c1c4..1d07f75203 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r24"
+PR = "r25"
 
 SRC_URI = "\
   file://Xdefaults \
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index ee4c85e646..f98ece35d7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r13"
+PR = "r18"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh
index 709cbbc9a9..2efa946f6c 100644
--- a/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/packages/zaurus-updater/zaurus-updater/updater.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 #
 # One updater.sh to rule them all
 #
@@ -22,10 +21,19 @@
 #
 # 2007.11.23 Koen Kooi
 # - consistent error messages
-## - fix flashing from case sensitive filesystem (e.g. ext2)
+# - fix flashing from case sensitive filesystem (e.g. ext2)
+#
 # 2007.11.23 Matthias 'CoreDump' Hentges
 # - Always treat MTD_PART_SIZE as HEX when comparing sizes
 # - Thanks to ZeroChaos for debugging
+#
+# 2007.12.04 Matthias 'CoreDump' Hentges
+# - Unb0rk flashing of Akita kernels
+#
+# 2007.12.10 Marcin 'Hrw' Juszkiewicz
+# - Reformatted file - please use spaces not tabs
+# - "version check" is only on Tosa and Poodle - breaks other machines
+#
 
 DATAPATH=$1
 TMPPATH=/tmp/update
@@ -151,17 +159,20 @@ do_flashing()
     if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
     then
         echo "Error: File is too big to flash!"
-	echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"	
+        echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
         return
     fi
 
-    #check version
-    /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
-    if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+    if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
     then
-        #no version info...
-        rm -f $TMPHEAD > /dev/null 2>&1
-        DATAPOS=0
+        #check version
+        /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+        if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+        then
+            #no version info...
+            rm -f $TMPHEAD > /dev/null 2>&1
+            DATAPOS=0
+        fi
     fi
 
     if [ $ISFORMATTED = 0 ]
@@ -190,42 +201,51 @@ do_flashing()
         /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
     fi
 
-	#loop
-	while [ $DATAPOS -lt $DATASIZE ]
-	do
-		#data create
-		bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
-		TMPSIZE=`wc -c $TMPDATA`
-		TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
-		DATAPOS=`expr $DATAPOS + $TMPSIZE`
-
-		#handle data file
-		if [ $ISLOGICAL = 0 ]
-		then
-			next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
-			if [ "$next_addr" = "" ]; then
-				echo "Error: flash write"
-				rm $TMPDATA > /dev/null 2>&1
-				RESULT=3
-				break;
-			fi
-			ADDR=$next_addr
-		else
-			/sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
-			ADDR=`expr $ADDR + $TMPSIZE`
-		fi
-
-		rm $TMPDATA > /dev/null 2>&1
-
-		#progress
-		SPNUM=0
-		while [ $SPNUM -lt $PROGSTEP ]
-		do
-			echo -n '.'
-			SPNUM=`expr $SPNUM + 1`
-		done
-	done
-
+        # Looks like Akita is quite unique when it comes to kernel flashing
+        
+        if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then 
+                echo $TARGETFILE':'$DATASIZE'bytes'
+                echo '                ' > /tmp/data
+                /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+                /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+                /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1     
+        else
+                #loop
+                while [ $DATAPOS -lt $DATASIZE ]
+                do
+                        #data create
+                        bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
+                        TMPSIZE=`wc -c $TMPDATA`
+                        TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
+                        DATAPOS=`expr $DATAPOS + $TMPSIZE`
+
+                        #handle data file
+                        if [ $ISLOGICAL = 0 ]
+                        then
+                                next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD  2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
+                                if [ "$next_addr" = "" ]; then
+                echo "Error: flash write"
+                                        rm $TMPDATA > /dev/null 2>&1
+                                        RESULT=3
+                                        break;
+                                fi
+                                ADDR=$next_addr
+                        else
+                                /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
+                                ADDR=`expr $ADDR + $TMPSIZE`
+                        fi
+
+                        rm $TMPDATA > /dev/null 2>&1
+
+                        #progress
+                        SPNUM=0
+                        while [ $SPNUM -lt $PROGSTEP ]
+                        do
+                                echo -n '.'
+                                SPNUM=`expr $SPNUM + 1`
+                        done
+                done
+        fi
     echo ''
 
     #finish
@@ -298,9 +318,9 @@ do
     DATASIZE=`echo $DATASIZE | cut -d' ' -f1`
 
     # make TARGETFILE lowercase
-    TARGETFILE=`echo $TARGETFILE|tr A-Z a-z`
+    TARGETFILE_LC=`echo $TARGETFILE|tr A-Z a-z`
 
-    case "$TARGETFILE" in
+    case "$TARGETFILE_LC" in
 
     zimage|zimage.bin)
         if [ $FLASHED_KERNEL != 0 ]
@@ -317,10 +337,9 @@ do
         ONESIZE=524288
         HDTOP=`expr $DATASIZE - 16`
         /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
-		echo "HDTOP=$HDTOP"
-		FLASH_TYPE="kernel"
+        FLASH_TYPE="kernel"
         do_flashing
-		FLASH_TYPE=""
+        FLASH_TYPE=""
         ;;
 
     initrd.bin)
@@ -339,9 +358,9 @@ do
         DATAPOS=16
         ONESIZE=1048576
         /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
-		FLASH_TYPE="rootfs"
+        FLASH_TYPE="rootfs"
         do_flashing
-		FLASH_TYPE=""
+        FLASH_TYPE=""
         ;;
 
     hdimage1.tgz)
@@ -356,8 +375,6 @@ do
     esac
 done
 
-/bin/sh
-
 # reboot
 exit 0
 
diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb
deleted file mode 100644
index 5b9161cfce..0000000000
--- a/packages/zroadmap/zroadmap_1.0.12.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection. A rudimentary trip feature allows \
-RoadMap to display some basic navigation information (distance to the destination, \
-direction, speed, etc..). Voice messages are generated that duplicate some of the screen information."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
-           file://qt2-fixes.patch;pnum=2;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
-           file://zroadgps.png"
-S = "${WORKDIR}/roadmap-${PV}/src"
-
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
-                GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \
-                GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"'
-PARALLEL_MAKE = ""
-
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
-
-do_compile() {
-	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
-	cd qt && oe_runmake
-}
-
-do_install() {
-	cd qt
-        install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/apps/Applications
-	install -d ${D}${palmtopdir}/pics
-        install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
-	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
-	install -d ${D}${palmtopdir}/share/roadmap/
-        install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/
-	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb
deleted file mode 100644
index fd9cc5e95f..0000000000
--- a/packages/zroadmap/zroadmap_cvs.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
-It displays a map of the streets, tracks the position provided by a NMEA-compliant \
-GPS receiver, identifies the street matching this GPS position and announces the name \
-of the crossing street at the next intersection."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
-HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
-DEPENDS = "popt expat"
-LICENSE = "GPL"
-PV = "1.0.12+cvs-${SRCDATE}"
-PR = "r0"
-
-SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
-           file://qt2-fixes-r1.patch;pnum=1;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
-           file://zroadgps.png"
-S = "${WORKDIR}/roadmap/src"
-
-inherit palmtop
-
-QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
-QT_LIBRARY_append_c7x0 = " -laticore"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
-                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
-                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-PARALLEL_MAKE = ""
-
-do_configure() {
-	echo removing pregenerated stuff
-	find . -name "moc*"|xargs rm -f
-}
-
-do_compile() {
-	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
-	oe_runmake -C gpx libgpx.a
-	oe_runmake -C unix libosroadmap.a
-	oe_runmake -C qt qtroadmap qtroadgps
-}
-
-do_install() {
-        install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/apps/Applications
-	install -d ${D}${palmtopdir}/pics
-        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
-	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
-	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
-	install -d ${D}${palmtopdir}/share/roadmap/
-        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
-	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
diff --git a/site/arm-darwin b/site/arm-darwin
new file mode 100644
index 0000000000..77a46dc862
--- /dev/null
+++ b/site/arm-darwin
@@ -0,0 +1,5 @@
+ac_cv_lib_m_sin=${ac_cv_lib_m_sin=yes}
+ac_cv_func_posix_spawn=${ac_cv_func_posix_spawn=no}
+glib_cv_stack_grows=${glib_cv_stack_grows=no}
+glib_cv_uscore=${glib_cv_uscore=no}
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
diff --git a/site/common-glibc b/site/common-glibc
index 1f9c967dff..0ec53423f1 100644
--- a/site/common-glibc
+++ b/site/common-glibc
@@ -33,10 +33,14 @@ mono_cv_uscore=${mono_cv_uscore=no}
 # guile
 ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes}
 
+#gcc-zlib
+ac_cv_func_getpagesize=${ac_cv_func_getpagesize=yes}
+ac_cv_func_memcpy=${ac_cv_func_memcpy=yes}
+ac_cv_func_strerror=${ac_cv_func_strerror=yes}
+
 # squid
 ac_cv_af_unix_large_dgram=${ac_cv_af_unix_large_dgram=yes}
 ac_cv_func_setresuid=${ac_cv_func_setresuid=yes}
 ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
 ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
 ac_cv_epoll_works=${ac_cv_epoll_works=yes}
-