merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'

     and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'

303 files changed, 5840 insertions, 4676 deletions

diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index fbd2814d35..5fadee4ab6 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -5,14 +5,26 @@
 # the directories are added at the head of the PATH list and ICECC_CXX
 # and ICEC_CC are set.
 #
-# For the cross compiler, creates a tar.bz2 of our toolchain and sets
+# For the cross compiler, creates a tar.gz of our toolchain and sets
 # ICECC_VERSION accordingly.
 #
-# This class needs ICECC_PATH to be set already. It must have
-# been exported from the shell running bitbake. Setting it in
-# local.conf is not adequate.
+#The class now handles all 3 different compile 'stages' (i.e native ,cross-kernel and target) creating the
+#necessary enviroment tar.gz file to be used by the remote machines
 #
-# This class objdump, ldconfig, grep, sed installed on the build host.
+#If ICECC_PATH is not set in local.conf then the class will try to locate it using 'which'
+#but nothing is sure ;)
+#
+#If ICECC_ENV_EXEC is set in local.conf should point to the icecc-create-env script provided by the user
+#or the default one provided by icecc-create-env.bb  will be used
+#(NOTE that this is a modified version of the script need it and *not the one that comes with icecc*
+#
+#User can specify if specific packages or packages belonging to class should not use icecc to distribute
+#compile jobs to remote machines, but handled localy, by defining ICECC_USER_CLASS_BL and ICECC_PACKAGE_BL
+#with the appropriate values in local.conf
+#########################################################################################
+#Error checking is kept to minimum so double check any parameters you pass to the class
+###########################################################################################
+
 
 def icc_determine_gcc_version(gcc):
     """
@@ -23,7 +35,7 @@ def icc_determine_gcc_version(gcc):
     import os
     return os.popen("%s --version" % gcc ).readline().split()[2]
 
-def create_env(bb,d):
+def create_cross_env(bb,d):
     """
     Create a tar.bz2 of the current toolchain
     """
@@ -40,20 +52,21 @@ def create_env(bb,d):
     distro  = bb.data.expand('${DISTRO}', d)
     target_sys = bb.data.expand('${TARGET_SYS}',  d)
     target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
-    float   = bb.data.getVar('${TARGET_FPU}', d) or "hard"
+    float   = bb.data.getVar('TARGET_FPU', d) or "hard"
     name    = socket.gethostname()
+  
 
     # Stupid check to determine if we have built a libc and a cross
     # compiler.
     try:
-        os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2'))
+        os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libc.so'))
         os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++'))
     except: # no cross compiler built yet
         return ""
 
     VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") )
-    cross_name = prefix + distro + target_sys + float +VERSION+ name
-    tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.bz2')
+    cross_name = prefix + distro + "-" + target_sys + "-" + float + "-" + VERSION + "-" + name
+    tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.gz')
 
     try:
         os.stat(tar_file)
@@ -66,74 +79,123 @@ def create_env(bb,d):
             # directory already exists, continue
             pass
 
-    # FIXME find out the version of the compiler
-    # Consider using -print-prog-name={cc1,cc1plus}
-    # and            -print-file-name=specs
-
-    # We will use the GCC to tell us which tools to use
-    #  What we need is:
-    #        -gcc
-    #        -g++
-    #        -as
-    #        -cc1
-    #        -cc1plus
-    #  and we add them to /usr/bin
-
-    tar = tarfile.open(tar_file, 'w:bz2')
-
-    # Now add the required files
-    tar.add(os.path.join(ice_dir,target_sys,'bin','gcc'),
-            os.path.join("usr","bin","gcc") )
-    tar.add(os.path.join(ice_dir,target_sys,'bin','g++'),
-            os.path.join("usr","bin","g++") )
-    tar.add(os.path.join(ice_dir,target_sys,'bin','as'),
-            os.path.join("usr","bin","as") )
-
-    cc = bb.data.getVar('CC', d, True)
-
-    # use bitbake's PATH so that the cross-compiler is actually found on the PATH
-    oldpath = os.environ['PATH']
-    os.environ['PATH'] = bb.data.getVar('PATH', d, True)
-
-    # FIXME falsely assuming there is only a single NEEDED per file
-    # FIXME falsely assuming the lib path is /lib
-
-    # which libc does the compiler need? (for example: libc.so.6)
-    libc = os.popen("objdump -x `which %s` | sed -n 's/.*NEEDED *//p'" % cc).read()[:-1]
-    # what is the absolute path of libc? (for example: /lib/libc.so.6)
-    # FIXME assuming only one entry is returned, which easily breaks
-    libc = os.popen("ldconfig -p | grep -e %s$ | sed 's:[^/]*/:/:'" % libc).read()[:-1]
-
-    # which loader does the compiler need?
-    ldlinux = os.popen("objdump -x %s | sed -n 's/.*NEEDED *//p'" % libc).read()[:-1]
-    ldlinux = os.popen("ldconfig -p | grep -e %s$ | sed 's:[^/]*/:/:'" % ldlinux).read()[:-1]
-
-    tar.add(libc)
-    tar.add(ldlinux)
+
+    #check if user has specified a specific icecc-create-env script
+    #if not use the OE provided one
+    cr_env_script = bb.data.getVar('ICECC_ENV_EXEC',  d) or  bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
+    #call the modified create-env script
+    result=os.popen("%s %s %s %s %s %s" %(cr_env_script,
+           "--silent",
+           os.path.join(ice_dir,target_sys,'bin','gcc'),
+           os.path.join(ice_dir,target_sys,'bin','g++'),
+           os.path.join(ice_dir,target_sys,'bin','as'),
+           os.path.join(ice_dir,"ice",cross_name) ) )
+    return tar_file
+
+
+def create_native_env(bb,d):
+
+    import tarfile, socket, time, os
+    ice_dir = bb.data.expand('${CROSS_DIR}', d)
+    prefix  = bb.data.expand('${HOST_PREFIX}' , d)
+    distro  = bb.data.expand('${DISTRO}', d)
+    target_sys = bb.data.expand('${TARGET_SYS}',  d)
+    target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
+    float   = bb.data.getVar('TARGET_FPU', d) or "hard"
+    name    = socket.gethostname()
   
-    # Now let us find cc1 and cc1plus
-    cc1 = os.popen("%s -print-prog-name=cc1" % cc).read()[:-1]
-    cc1plus = os.popen("%s -print-prog-name=cc1plus" % cc).read()[:-1]
-    spec = os.popen("%s -print-file-name=specs" % cc).read()[:-1]
+    
+    archive_name = "local-host-env" + "-" + name
+    tar_file = os.path.join(ice_dir, 'ice', archive_name + '.tar.gz')
 
-    os.environ['PATH'] = oldpath
+    try:
+        os.stat(tar_file)
+	# tar file already exists
+        return tar_file
+    except: 
+        try:
+            #os.makedirs(os.path.join(ice_dir))
+            os.makedirs(os.path.join(ice_dir,'ice'))
+        except:
+            # directory already exists, continue
+            pass
+
+
+    #check if user has specified a specific icecc-create-env script
+    #if not use the OE provided one
+    cr_env_script = bb.data.getVar('ICECC_ENV_EXEC',  d) or  bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
+    result=os.popen("%s %s %s %s %s %s" %(cr_env_script,
+           "--silent",
+           os.popen("%s gcc" % "which").read()[:-1],
+           os.popen("%s g++" % "which").read()[:-1],
+           os.popen("%s as" % "which").read()[:-1],
+           os.path.join(ice_dir,"ice",archive_name) ) )
+    return tar_file
+
+
+
+def create_cross_kernel_env(bb,d):
+
+    import tarfile, socket, time, os
+    ice_dir = bb.data.expand('${CROSS_DIR}', d)
+    prefix  = bb.data.expand('${HOST_PREFIX}' , d)
+    distro  = bb.data.expand('${DISTRO}', d)
+    target_sys = bb.data.expand('${TARGET_SYS}',  d)
+    target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
+    float   = bb.data.getVar('TARGET_FPU', d) or "hard"
+    name    = socket.gethostname()
+    kernel_cc = bb.data.expand('${KERNEL_CC}', d)
+    kernel_cc = kernel_cc[:-1]
+  
+
+    # Stupid check to determine if we have built a libc and a cross
+    # compiler.
+    try:
+       os.stat(os.path.join(ice_dir, 'bin', kernel_cc))
+    except: # no cross compiler built yet
+        return ""
 
-    # CC1 and CC1PLUS should be there...
-    #tar.add(cc1, os.path.join('usr', 'bin', 'cc1'))
-    #tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus'))
+    VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) )
+    cross_name = prefix + distro + "-" + target_sys + "-" + float + "-" + VERSION + "-" + name
+    tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.gz')
 
-    # I think they should remain absolute paths (as gcc expects them there)
-    tar.add(cc1)
-    tar.add(cc1plus)
+    try:
+        os.stat(tar_file)
+	# tar file already exists
+        return tar_file
+    except: 
+        try:
+            os.makedirs(os.path.join(ice_dir,'ice'))
+        except:
+            # directory already exists, continue
+            pass
 
-    # spec - if it exists
-    if os.path.exists(spec):
-        tar.add(spec)
 
-    tar.close()
+    #check if user has specified a specific icecc-create-env script
+    #if not use the OE provided one
+    cr_env_script = bb.data.getVar('ICECC_ENV_EXEC',  d) or  bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
+    result=os.popen("%s %s %s %s %s %s" %(cr_env_script,
+           "--silent",
+           os.path.join(ice_dir,'bin',kernel_cc),
+           os.path.join(ice_dir,target_sys,'bin','g++'),
+           os.path.join(ice_dir,target_sys,'bin','as'),
+           os.path.join(ice_dir,"ice",cross_name) ) )
     return tar_file
 
 
+def create_env(bb,d):
+
+        #return create_cross_kernel_env(bb,d) 
+        if bb.data.inherits_class("native", d):
+          return create_native_env(bb,d)
+        elif bb.data.inherits_class("kernel", d):
+          return create_cross_kernel_env(bb,d)
+        elif bb.data.inherits_class("cross", d):
+          return create_native_env(bb,d)
+        else:  
+          return create_cross_env(bb,d)
+        
+       
 def create_path(compilers, type, bb, d):
     """
     Create Symlinks for the icecc in the staging directory
@@ -141,8 +203,11 @@ def create_path(compilers, type, bb, d):
     import os
 
     staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type)
-    icecc   = bb.data.getVar('ICECC_PATH', d)
 
+    #check if the icecc path is set by the user
+    icecc   = bb.data.getVar('ICECC_PATH', d) or os.popen("%s icecc" % "which").read()[:-1]
+
+    
     # Create the dir if necessary
     try:
         os.stat(staging)
@@ -158,42 +223,87 @@ def create_path(compilers, type, bb, d):
 
     return staging + ":"
 
+
+
+
+
 def use_icc_version(bb,d):
-    # Constin native native
-    prefix = bb.data.expand('${HOST_PREFIX}', d)
-    if len(prefix) == 0:
-        return "no"
 
-    blacklist = [ "cross", "native" ]
+      icecc_ver = "yes"
+      system_class_blacklist = [ "none" ] 
+      
+      for black in system_class_blacklist:
+           if bb.data.inherits_class(black, d):
+              icecc_ver = "no"
+
+
+      user_class_blacklist =  bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
+      user_class_blacklist = user_class_blacklist.split()
+      
+      for black in user_class_blacklist:
+           if bb.data.inherits_class(black, d):
+              icecc_ver = "no"
+ 
+      return icecc_ver
 
-    for black in blacklist:
-        if bb.data.inherits_class(black, d):
-            return "no"
 
-    return "yes"
 
 def icc_path(bb,d,compile):
-    native = bb.data.expand('${PN}', d)
-    blacklist = [ "ulibc", "glibc", "ncurses" ]
-    for black in blacklist:
-        if black in native:
-            return ""
+    package_tmp = bb.data.expand('${PN}', d)
+
+    #"system" package blacklist contains a list of packages that can not distribute compile tasks
+    #for one reason or the other
+    system_package_blacklist = [ "uclibc", "glibc", "qemu" ]
+
+    for black in system_package_blacklist:
+      if black in package_tmp:
+         return ""
+
+    #user defined exclusion list
+    user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "none"   
+    user_package_blacklist = user_package_blacklist.split()
+
+    for black in user_package_blacklist:
+      if black in package_tmp:
+         return ""
 
-    blacklist = [ "cross", "native" ]
-    for black in blacklist:
-        if bb.data.inherits_class(black, d):
-            compile = False
 
     prefix = bb.data.expand('${HOST_PREFIX}', d)
-    if compile and len(prefix) != 0:
-        return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d)
+
+            
+    if compile and bb.data.inherits_class("cross", d):
+       return create_path( ["gcc", "g++"], "native", bb, d)
+
+    elif compile and bb.data.inherits_class("native", d):
+         return create_path( ["gcc", "g++"], "native", bb, d)
+
+    elif compile and bb.data.inherits_class("kernel", d):
+         #kernel_cc = bb.data.expand('${KERNEL_CC}', d) 
+          return create_path( [get_cross_kernel_ver(bb,d), "foo"], "cross-kernel", bb, d)
+
     elif not compile or len(prefix) == 0:
-        return create_path( ["gcc", "g++"], "native", bb, d)
+           return create_path( ["gcc", "g++"], "native", bb, d)
+
+    else:
+           return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d)      
+
+
+
 
 def icc_version(bb,d):
     return create_env(bb,d)
 
-#
+def check_for_kernel(bb,d):     
+     if  bb.data.inherits_class("kernel", d):
+       return "yes"
+
+       return "no"
+
+
+def get_cross_kernel_ver(bb,d):
+
+       return  bb.data.expand('${KERNEL_CC}', d).strip() or "gcc"
+ 
 # set the icecream environment variables
 do_configure_prepend() {
     export PATH=${@icc_path(bb,d,False)}$PATH
@@ -202,12 +312,22 @@ do_configure_prepend() {
 }
 
 do_compile_prepend() {
+
     export PATH=${@icc_path(bb,d,True)}$PATH
+
+ #check if we are building a kernel and select gcc-cross-kernel
+ if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then
+    export ICECC_CC="${@get_cross_kernel_ver(bb,d)}"
+    export ICECC_CXX="${HOST_PREFIX}g++"
+ else
     export ICECC_CC="${HOST_PREFIX}gcc"
     export ICECC_CXX="${HOST_PREFIX}g++"
+ fi
 
     if [ "${@use_icc_version(bb,d)}" = "yes" ]; then
-        print ICECC_VERSION="${@icc_version(bb,d)}"
         export ICECC_VERSION="${@icc_version(bb,d)}"
+    else
+        export ICECC_VERSION="NONE"
     fi
 }
+
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 630fbc6bbf..eff7a14e42 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "22"
+DISTRO_REVISION = "25"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -69,7 +69,7 @@ FEED_URIS += " \
 # We will lock down a SRCDATE when we go into release mode
 #SRCDATE = "20061029"
 
-PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
+PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
 
 
@@ -92,7 +92,7 @@ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.2.1"
 #fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.6"
+PREFERRED_VERSION_cairo = "1.3.8"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -177,10 +177,10 @@ PREFERRED_VERSION_busybox = "1.2.1"
 
 PCMCIA_MANAGER = "pcmciautils"
 
-PREFERRED_VERSION_dbus ?= "1.0.1"
+PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.71"
 
-PREFERRED_VERSION_gstreamer ?= "0.10.6"
+PREFERRED_VERSION_gstreamer ?= "0.10.11"
 
 PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
 PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index c75241f8a0..f73fa22e34 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814"
 SRCDATE_contacts ?= "20060707"
 SRCDATE_dates ?= "20060707"
 SRCDATE_fstests ?= "20061122"
-SRCDATE_eds-dbus ?= "20060707"
+SRCDATE_eds-dbus ?= "20061215"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_matchbox-common ?= "20060612"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 892c589389..25ac84d270 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -75,3 +75,10 @@ INHERIT += "nslu2-mirrors"
 PREFERRED_VERSION_ipkg ?= "0.99.154"
 PREFERRED_VERSION_ipkg-native ?= "0.99.154"
 
+#-------------------------------------------------------------------
+#                           FIXME!
+# This is clearly wrong, the headers should match the 2.4.22 kernel,
+# but locking this to 2.6.11.1 at least gets Unslung building again.
+# - mwester 16 Dec 2006
+#
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index a369eab0a3..fe3cdbc481 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -2,12 +2,12 @@
 #@NAME: Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
 #@DESCRIPTION: Machine configuration for the Motorola GSM phones A780, E680, and E680i
 
-require conf/machine/include/motorola-ezx.conf
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 5685c3d0f3..2682fb300f 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 047e44707c..d1afb882e3 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C7x0
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0eb733bfb5..0f8ed6ed82 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -15,7 +15,7 @@ require conf/machine/include/tune-xscale.conf
 #require conf/machine/include/tune-iwmmxt.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen"
+MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth"
 
 #
 # Software/packages selection
diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf
new file mode 100644
index 0000000000..862c2c3fcc
--- /dev/null
+++ b/conf/machine/include/tune-thumb.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH += " -mthumb "
+
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
deleted file mode 100644
index edd68c08f8..0000000000
--- a/conf/machine/ipaq-pxa270.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-#@TYPE: Machine
-#@NAME: iPAQ hx47xx hx2xxx
-#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
-#use this for a hx47xx ipaq
-PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-
-#use this for a hx2xxx ipaq
-#PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-PREFERRED_VERSION_orinoco-modules = "0.15rc1"
-
-ROOT_FLASH_SIZE = "80"
-
-EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-			  -e 256KiB -p"
-
-IMAGE_FSTYPES ?= "jffs2"
-
-MODUTILS = "26"	
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
-
-PCMCIA_MANAGER = "pcmciautils"
-BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
-BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware"
-
-PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
-
-
-# These modules are now compiled into the kernel:
-#HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \
-#                  hx4700_pcmcia hx4700_ts hx4700_power"
-
-HX4700_MODULES = "i2c-pxa hx4700_voltage hx4700_acx snd_hx4700_audio"
-
-
-module_autoload_evdev = "evdev"
-module_autoload_hx4700_power = "hx4700_power"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
-module_autoload_asic3_mmc = "asic3_mmc"
-module_autoload_mmc_block = "mmc_block"
-module_autoload_hx4700_ts = "hx4700_ts"
-module_autoload_hx4700_navpt = "hx4700_navpt"
-module_autoload_hx4700_bt = "hx4700_bt"
-module_autoload_snd-hx4700_audio = "snd-hx4700_audio"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_pxa27x_udc = "pxa27x_udc"
-
-#FIXME: this should be controlled by a userspace utility later.
-module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
index 5108623750..700f7995fb 100644
--- a/conf/machine/ixp4xxbe.conf
+++ b/conf/machine/ixp4xxbe.conf
@@ -7,7 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 ARCH_BYTE_SEX = "be"
 include conf/machine/include/ixp4xx.conf
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 --faketime -n"
 
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index ac62d669e5..347c7ba3fb 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -7,7 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 ARCH_BYTE_SEX = "le"
 include conf/machine/include/ixp4xx.conf
 
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 9a54643b3f..455ae56677 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-2.6.conf
+include conf/machine/include/zaurus-clamshell.conf
 
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
diff --git a/contrib/site-conf/configure.ac b/contrib/site-conf/configure.ac
index 283008a4a7..bd5ce4dfad 100644
--- a/contrib/site-conf/configure.ac
+++ b/contrib/site-conf/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([zeckes-tests], [aleph-1], [noreply@::1])
-AC_PREREQ([2.60])
+AC_PREREQ([2.59])
 
 #
 #AC_CONFIG_MACRO_DIR([m4])
diff --git a/packages/acpid/acpid.inc b/packages/acpid/acpid.inc
new file mode 100644
index 0000000000..c96f431224
--- /dev/null
+++ b/packages/acpid/acpid.inc
@@ -0,0 +1,32 @@
+SECTION = "base"
+DESCRIPTION = "A daemon for delivering ACPI events."
+LICENSE="GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
+           file://init"
+
+EXTRA_OEMAKE = ""
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+}
+
+do_install () {
+	oe_runmake 'INSTPREFIX=${D}' install
+	install -d ${D}${sysconfdir}/init.d
+	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
+	chmod 755 ${D}${sysconfdir}/init.d/acpid
+}
+
+pkg_postinst () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid defaults
+}
+
+pkg_prerm () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid remove
+}
diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb
index c96f431224..af1d3b2853 100644
--- a/packages/acpid/acpid_1.0.2.bb
+++ b/packages/acpid/acpid_1.0.2.bb
@@ -1,32 +1 @@
-SECTION = "base"
-DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
-           file://init"
-
-EXTRA_OEMAKE = ""
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-	oe_runmake 'INSTPREFIX=${D}' install
-	install -d ${D}${sysconfdir}/init.d
-	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
-	chmod 755 ${D}${sysconfdir}/init.d/acpid
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid remove
-}
+require acpid.inc
diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb
index 4ce3878785..596ef49452 100644
--- a/packages/acpid/acpid_1.0.3.bb
+++ b/packages/acpid/acpid_1.0.3.bb
@@ -1,33 +1,2 @@
-SECTION = "base"
-DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
-   	   file://gcc40.patch;patch=1 \
-           file://init"
-
-EXTRA_OEMAKE = ""
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-	oe_runmake 'INSTPREFIX=${D}' install
-	install -d ${D}${sysconfdir}/init.d
-	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
-	chmod 755 ${D}${sysconfdir}/init.d/acpid
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid remove
-}
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"
diff --git a/packages/acpid/acpid_1.0.4.bb b/packages/acpid/acpid_1.0.4.bb
index 4ce3878785..596ef49452 100644
--- a/packages/acpid/acpid_1.0.4.bb
+++ b/packages/acpid/acpid_1.0.4.bb
@@ -1,33 +1,2 @@
-SECTION = "base"
-DESCRIPTION = "A daemon for delivering ACPI events."
-LICENSE="GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
-   	   file://gcc40.patch;patch=1 \
-           file://init"
-
-EXTRA_OEMAKE = ""
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
-}
-
-do_install () {
-	oe_runmake 'INSTPREFIX=${D}' install
-	install -d ${D}${sysconfdir}/init.d
-	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
-	chmod 755 ${D}${sysconfdir}/init.d/acpid
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D acpid remove
-}
+require acpid.inc
+SRC_URI += "file://gcc40.patch;patch=1"
diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb
index ec1998d64b..2c9008c6f0 100644
--- a/packages/apr/apr-util_1.2.7.bb
+++ b/packages/apr/apr-util_1.2.7.bb
@@ -3,12 +3,16 @@ SECTION = "libs"
 DEPENDS = "apr expat gdbm"
 LICENSE = "Apache License, Version 2.0"
 
-PR = "r0"
+PR = "r1"
 
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz"
 
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
+		--with-gdbm=${STAGING_DIR}/${HOST_SYS} \
+		--without-sqlite2 \
+		--without-sqlite3 \
+		--with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
diff --git a/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch
deleted file mode 100644
index 208c65108b..0000000000
--- a/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: arpwatch/Makefile.in
-diff -u arpwatch/Makefile.in:1.1.1.1 arpwatch/Makefile.in:1.1.1.1.10.1
---- arpwatch/Makefile.in:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/Makefile.in	Tue Apr 17 13:53:29 2001
-@@ -31,7 +31,8 @@
- # Pathname of directory to install the man page
- MANDEST = @mandir@
- # Pathname of directory to install database file
--ARPDIR = $(prefix)/arpwatch
-+ARPDIR = /var/lib/arpwatch
-+ETHERCODES = /usr/share/arpwatch/ethercodes.dat
- 
- # VPATH
- srcdir = @srcdir@
-@@ -45,7 +46,8 @@
- PROG = arpwatch
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
-+	-DETHERCODES=\"$(ETHERCODES)\"
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-Index: arpwatch/arpsnmp.8
-diff -u arpwatch/arpsnmp.8:1.1.1.1 arpwatch/arpsnmp.8:1.1.1.1.10.1
---- arpwatch/arpsnmp.8:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpsnmp.8	Tue Apr 17 13:53:29 2001
-@@ -1,4 +1,4 @@
--.\" @(#) $Id: arpsnmp.8,v 1.5 2000/09/17 20:34:41 leres Exp $ (LBL)
-+.\" @(#) $Id: arpsnmp.8,v 1.5 2001/04/17 20:34:41 leres Exp $ (LBL)
- .\"
- .\" Copyright (c) 1996, 1997, 1999, 2000
- .\"	The Regents of the University of California.  All rights reserved.
-@@ -69,9 +69,9 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/var/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
--ethercodes.dat - vendor ethernet block list
-+/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
- .ad
- .hy
- .fi
-Index: arpwatch/arpwatch.8
-diff -u arpwatch/arpwatch.8:1.1.1.1 arpwatch/arpwatch.8:1.1.1.1.10.1
---- arpwatch/arpwatch.8:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpwatch.8	Tue Apr 17 13:53:29 2001
-@@ -1,4 +1,4 @@
--.\" @(#) $Id: arpwatch.8,v 1.13 2000/10/08 20:31:25 leres Exp $ (LBL)
-+.\" @(#) $Id: arpwatch.8,v 1.13 2001/04/17 20:31:25 leres Exp $ (LBL)
- .\"
- .\" Copyright (c) 1992, 1994, 1996, 1997, 2000
- .\"	The Regents of the University of California.  All rights reserved.
-@@ -152,9 +152,9 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/var/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
--ethercodes.dat - vendor ethernet block list
-+/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
- .ad
- .hy
- .fi
-Index: arpwatch/arpwatch.h
-diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1
---- arpwatch/arpwatch.h:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpwatch.h	Tue Apr 17 13:53:29 2001
-@@ -1,7 +1,7 @@
- /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
- 
- #define ARPFILE "arp.dat"
--#define ETHERCODES "ethercodes.dat"
-+/* #define ETHERCODES "ethercodes.dat" */
- #define CHECKPOINT (15*60)		/* Checkpoint time in seconds */
- 
- #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
-Index: arpwatch/bihourly
-diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1
---- arpwatch/bihourly:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/bihourly	Tue Apr 17 13:53:29 2001
-@@ -6,7 +6,7 @@
- PATH=$PATH:/usr/local/sbin
- export PATH
- #
--cd /usr/operator/arpwatch
-+cd /var/lib/arpwatch
- #
- list=`cat list`
- cname=`cat cname`
-@@ -14,7 +14,7 @@
- #
- alist=""
- for r in $list; do \
--	./arpfetch $r $cname > $r 2> $errs
-+	arpfetch $r $cname > $r 2> $errs
- 	if test -s $errs; then
- 		echo "arpfetch $r failed:"
- 		sed -e 's/^/    /' $errs
diff --git a/packages/arpwatch/arpwatch_2.1a13.bb b/packages/arpwatch/arpwatch_2.1a13.bb
deleted file mode 100644
index 6605b2482d..0000000000
--- a/packages/arpwatch/arpwatch_2.1a13.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Ethernet/FDDI station activity monitor"
-LICENSE = "BSD"
-SECTION = "network"
-HOMEPAGE = "http://www-nrg.ee.lbl.gov/"
-DEPENDS = "fakeroot-native"
-RRECOMMENDS = "arpwatch-data"
-
-SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \
-    file://05debian_fhs.patch;patch=1 \
-    file://06debian_manpages.patch;patch=1 \
-    file://init.d \
-    file://arpwatch.default \
-    file://arpwatch.conf \
-    file://ethercodes.dat \
-    file://make.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
-
-fakeroot do_install() {
-    install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \
-               ${D}${sysconfdir}/default \
-               ${D}${sysconfdir}/init.d \
-               ${D}${datadir}/arpwatch
-
-    oe_runmake install DESTDIR=${D}
-    oe_runmake install-man DESTDIR=${D}
-
-    install -m 0755 ${S}/arp2ethers         ${D}${sbindir}
-    install -m 0755 ${S}/arpfetch           ${D}${sbindir}
-    install -m 0755 ${S}/bihourly           ${D}${sbindir}
-    install -m 0755 ${S}/massagevendor      ${D}${sbindir}
-
-    install -m 0644 ${S}/arp2ethers.8      ${D}${mandir}/man8
-    install -m 0644 ${S}/arpfetch.8        ${D}${mandir}/man8
-    install -m 0644 ${S}/bihourly.8        ${D}${mandir}/man8
-    install -m 0644 ${S}/massagevendor.8   ${D}${mandir}/man8
-
-    install -m 0755 ${WORKDIR}/init.d      ${D}${sysconfdir}/init.d/arpwatch
-    install -m 0644 ${WORKDIR}/arpwatch.default   ${D}${sysconfdir}/default/arpwatch
-    install -m 0644 ${WORKDIR}/arpwatch.conf      ${D}${sysconfdir}
-
-    install -m 0644 ${WORKDIR}/ethercodes.dat     ${D}${datadir}/arpwatch
-}
-
-PACKAGES =+ "arpwatch-data"
-FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat"
diff --git a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty b/packages/autoconf/autoconf-2.61/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty
+++ b/packages/autoconf/autoconf-2.61/.mtn2git_empty
diff --git a/packages/autoconf/autoconf-2.61/autoconf-x.patch b/packages/autoconf/autoconf-2.61/autoconf-x.patch
new file mode 100644
index 0000000000..596535b7d6
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoconf-x.patch
@@ -0,0 +1,36 @@
+Index: lib/autoconf/libs.m4
+===================================================================
+RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v
+retrieving revision 1.13
+diff -p -u -r1.13 libs.m4
+--- autoconf-2.59/lib/autoconf/libs.m4	6 Sep 2005 15:34:06 -0000	1.13
++++ autoconf-2.59/lib/autoconf/libs.m4	18 Sep 2005 17:09:58 -0000
+@@ -265,13 +265,13 @@ ac_x_header_dirs='
+ /usr/openwin/share/include'
+ 
+ if test "$ac_x_includes" = no; then
+-  # Guess where to find include files, by looking for Intrinsic.h.
++  # Guess where to find include files, by looking for Xlib.h.
+   # First, try using that file with no special directory specified.
+-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
++  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
+ [# We can compile using X headers with no special include directory.
+ ac_x_includes=],
+ [for ac_dir in $ac_x_header_dirs; do
+-  if test -r "$ac_dir/X11/Intrinsic.h"; then
++  if test -r "$ac_dir/X11/Xlib.h"; then
+     ac_x_includes=$ac_dir
+     break
+   fi
+@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+-  LIBS="-lXt $LIBS"
+-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
+-				  [XtMalloc (0)])],
++  LIBS="-lX11 $LIBS"
++  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
++				  [XrmInitialize ()])],
+ 		 [LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=],
diff --git a/packages/autoconf/autoconf-2.61/autoconf259-update-configscripts.patch b/packages/autoconf/autoconf-2.61/autoconf259-update-configscripts.patch
new file mode 100644
index 0000000000..2adda7403d
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoconf259-update-configscripts.patch
@@ -0,0 +1,393 @@
+--- autoconf-2.59/build-aux/config.guess.old	2003-10-23 10:28:51.000000000 -0400
++++ autoconf-2.59/build-aux/config.guess	2004-04-24 22:36:28.000000000 -0400
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+-timestamp='2003-10-03'
++timestamp='2004-03-12'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -197,12 +197,18 @@
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit 0 ;;
++    amd64:OpenBSD:*:*)
++	echo x86_64-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     arc:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    cats:OpenBSD:*:*)
++	echo arm-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -221,6 +227,9 @@
+     mvmeppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    pegasos:OpenBSD:*:*)
++	echo powerpc-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     pmax:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -236,10 +245,24 @@
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:MirBSD:*:*)
++	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
+     alpha:OSF1:*:*)
+-	if test $UNAME_RELEASE = "V4.0"; then
++	case $UNAME_RELEASE in
++	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+-	fi
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+ 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+ 	# covers most systems running today.  This code pipes the CPU
+@@ -277,11 +300,12 @@
+ 	    "EV7.9 (21364A)")
+ 		UNAME_MACHINE="alphaev79" ;;
+ 	esac
++	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ 	exit 0 ;;
+     Alpha*:OpenVMS:*:*)
+ 	echo alpha-hp-vms
+@@ -307,6 +331,9 @@
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit 0 ;;
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
++	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+@@ -399,6 +426,9 @@
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
++	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -742,6 +772,11 @@
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
++    5000:UNIX_System_V:4.*:*)
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit 0 ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -751,7 +786,7 @@
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
++    *:FreeBSD:*:*)
+ 	# Determine whether the default compiler uses glibc.
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -763,7 +798,7 @@
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
++	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+ 	# FreeBSD's kernel, but not the complete OS.
+ 	case ${LIBC} in gnu) kernel_only='k' ;; esac
+ 	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+@@ -799,8 +834,13 @@
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
++	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	exit 0 ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+@@ -813,6 +853,9 @@
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+@@ -981,6 +1024,9 @@
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
++	i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit 0 ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1052,7 +1098,7 @@
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -1167,7 +1213,7 @@
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit 0 ;;
+-    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
++    NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:NonStop-UX:*:*)
+@@ -1211,6 +1257,9 @@
+     SEI:*:*:SEIUX)
+         echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+--- autoconf-2.59/build-aux/config.sub.old	2003-10-23 10:28:51.000000000 -0400
++++ autoconf-2.59/build-aux/config.sub	2004-04-24 22:36:28.000000000 -0400
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+-timestamp='2003-08-18'
++timestamp='2004-03-12'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -118,7 +118,8 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
++  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -236,7 +237,7 @@
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m68000 | m68k | m88k | mcore \
++	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -261,7 +262,7 @@
+ 	| pyramid \
+ 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
++	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ 	| strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+@@ -307,7 +308,7 @@
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* \
++	| m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+@@ -335,7 +336,7 @@
+ 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+@@ -362,6 +363,9 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
++    	abacus)
++		basic_machine=abacus-unknown
++		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+@@ -379,6 +383,9 @@
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
+@@ -438,12 +445,20 @@
+ 		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
++	cr16c)
++		basic_machine=cr16c-unknown
++		os=-elf
++		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -743,6 +758,10 @@
+ 		basic_machine=or32-unknown
+ 		os=-coff
+ 		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
++		;;
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+ 		os=-ose
+@@ -963,6 +982,10 @@
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
+ 		;;
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+@@ -1058,7 +1081,7 @@
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+-	sparc | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1131,19 +1154,20 @@
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1182,6 +1206,9 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
++        -os400*)
++		os=-os400
++		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
+@@ -1203,6 +1230,9 @@
+ 	-atheos*)
+ 		os=-atheos
+ 		;;
++	-syllable*)
++		os=-syllable
++		;;
+ 	-386bsd)
+ 		os=-bsd
+ 		;;
+@@ -1225,6 +1255,9 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
++        -tpf*)
++		os=-tpf
++		;;
+ 	-triton*)
+ 		os=-sysv3
+ 		;;
+@@ -1473,9 +1506,15 @@
+ 			-mvs* | -opened*)
+ 				vendor=ibm
+ 				;;
++			-os400*)
++				vendor=ibm
++				;;
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
++			-tpf*)
++				vendor=ibm
++				;;
+ 			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
diff --git a/packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch b/packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch
new file mode 100644
index 0000000000..1f18e04bba
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch
@@ -0,0 +1,13 @@
+--- autoconf-2.59/bin/autoheader.in~	2003-10-10 14:52:56.000000000 +0100
++++ autoconf-2.59/bin/autoheader.in	2004-05-03 01:36:45.000000000 +0100
+@@ -272,8 +272,8 @@
+ 	}
+ 
+     }
+-  exit 1
+-    if keys %symbol;
++#  exit 1
++#    if keys %symbol;
+ }
+ 
+ update_file ("$tmp/config.hin", "$config_h_in");
diff --git a/packages/autoconf/autoconf-2.61/autoreconf-exclude.patch b/packages/autoconf/autoconf-2.61/autoreconf-exclude.patch
new file mode 100644
index 0000000000..ab85fae337
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoreconf-exclude.patch
@@ -0,0 +1,127 @@
+Index: autoconf-2.61/bin/autoreconf.in
+===================================================================
+--- autoconf-2.61.orig/bin/autoreconf.in	2006-12-14 20:25:59.000000000 +0100
++++ autoconf-2.61/bin/autoreconf.in	2006-12-14 20:33:11.000000000 +0100
+@@ -76,6 +76,7 @@
+   -i, --install            copy missing auxiliary files
+       --no-recursive       don't rebuild sub-packages
+   -s, --symlink            with -i, install symbolic links instead of copies
++  -x, --exclude=STEPS      steps we should not run
+   -m, --make               when applicable, re-run ./configure && make
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
+ 
+@@ -134,6 +135,13 @@
+ # Recurse into subpackages
+ my $recursive = 1;
+ 
++# Steps to exclude
++my @exclude;
++my @ex;
++
++my $uses_gettext;
++my $configure_ac;
++
+ ## ---------- ##
+ ## Routines.  ##
+ ## ---------- ##
+@@ -151,6 +159,7 @@
+ 	  'B|prepend-include=s'	 => \@prepend_include,
+ 	  'i|install'            => \$install,
+ 	  's|symlink'            => \$symlink,
++ 	  'x|exclude=s'          => \@exclude,
+ 	  'm|make'               => \$make,
+ 	  'recursive!'           => \$recursive);
+ 
+@@ -160,6 +169,8 @@
+   parse_WARNINGS;
+   parse_warnings '--warnings', @warning;
+ 
++  @exclude = map { split /,/ } @exclude;
++
+   # Even if the user specified a configure.ac, trim to get the
+   # directory, and look for configure.ac again.  Because (i) the code
+   # is simpler, and (ii) we are still able to diagnose simultaneous
+@@ -253,6 +264,11 @@
+ {
+   my ($aclocal, $flags) = @_;
+ 
++  @ex = grep (/^aclocal$/, @exclude);
++  if ($#ex != -1) {
++    return;
++  }
++
+   # aclocal 1.8+ does all this for free.  It can be recognized by its
+   # --force support.
+   if ($aclocal_supports_force)
+@@ -366,7 +382,10 @@
+     }
+   else
+     {
+-      xsystem "$autopoint";
++      @ex = grep (/^autopoint$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autopoint");
++      }
+     }
+ 
+ 
+@@ -530,7 +549,10 @@
+ 	{
+ 	  $libtoolize .= " --ltdl";
+ 	}
+-      xsystem ($libtoolize);
++      @ex = grep (/^libtoolize$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$libtoolize");
++      }
+       $rerun_aclocal = 1;
+     }
+   else
+@@ -570,7 +592,10 @@
+   # latter runs the former, and (ii) autoconf is stricter than
+   # autoheader.  So all in all, autoconf should give better error
+   # messages.
+-  xsystem ($autoconf);
++  @ex = grep (/^autoconf$/, @exclude);
++  if ($#ex == -1) {
++    xsystem ("$autoconf");
++  }
+ 
+ 
+   # -------------------- #
+@@ -591,7 +616,10 @@
+     }
+   else
+     {
+-      xsystem ($autoheader);
++      @ex = grep (/^autoheader$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$autoheader");
++      }
+     }
+ 
+ 
+@@ -608,7 +636,10 @@
+       # We should always run automake, and let it decide whether it shall
+       # update the file or not.  In fact, the effect of `$force' is already
+       # included in `$automake' via `--no-force'.
+-      xsystem ($automake);
++      @ex = grep (/^automake$/, @exclude);
++      if ($#ex == -1) {
++        xsystem ("$automake");
++      }
+     }
+ 
+ 
+@@ -632,7 +663,10 @@
+ 	    }
+ 	  else
+ 	    {
+-	      xsystem ("make");
++              @ex = grep (/^make$/, @exclude);
++              if ($#ex == -1) {
++                xsystem ("make");
++              }
+ 	    }
+ 	}
+     }
diff --git a/packages/autoconf/autoconf-2.61/autoreconf-foreign.patch b/packages/autoconf/autoconf-2.61/autoreconf-foreign.patch
new file mode 100644
index 0000000000..587a823826
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoreconf-foreign.patch
@@ -0,0 +1,11 @@
+--- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign	2004-05-09 20:55:06.000000000 -0400
++++ autoconf-2.59/bin/autoreconf.in	2004-05-09 20:55:55.000000000 -0400
+@@ -184,6 +184,8 @@
+ 
+   $aclocal_supports_force = `$aclocal --help` =~ /--force/;
+ 
++  $automake   .= ' --foreign';
++
+   # Dispatch autoreconf's option to the tools.
+   # --include;
+   $autoconf   .= join (' --include=', '', @include);
diff --git a/packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch b/packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch
new file mode 100644
index 0000000000..c243ce0216
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch
@@ -0,0 +1,49 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: autoconf-2.61/bin/autoreconf.in
+===================================================================
+--- autoconf-2.61.orig/bin/autoreconf.in	2006-12-14 20:33:52.000000000 +0100
++++ autoconf-2.61/bin/autoreconf.in	2006-12-14 20:34:28.000000000 +0100
+@@ -58,7 +58,7 @@
+ $help = "Usage: $0 [OPTION] ... [DIRECTORY] ...
+ 
+ Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
+-(formerly `gettextize'), and `libtoolize' where appropriate)
++(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate)
+ repeatedly to remake the GNU Build System files in specified
+ DIRECTORIES and their subdirectories (defaulting to `.').
+ 
+@@ -107,12 +107,13 @@
+ ";
+ 
+ # Lib files.
+-my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@';
+-my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
+-my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
+-my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
+-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
+-my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
++my $autoconf      = $ENV{'AUTOCONF'}     || '@bindir@/@autoconf-name@';
++my $autoheader    = $ENV{'AUTOHEADER'}   || '@bindir@/@autoheader-name@';
++my $automake      = $ENV{'AUTOMAKE'}     || 'automake';
++my $aclocal       = $ENV{'ACLOCAL'}      || 'aclocal';
++my $libtoolize    = $ENV{'LIBTOOLIZE'}   || 'libtoolize';
++my $autopoint     = $ENV{'AUTOPOINT'}    || 'autopoint';
++my $gnuconfigize  = $ENV{'GNUCONFIGIZE'} || 'gnu-configize';
+ 
+ # --install -- as --add-missing in other tools.
+ my $install = 0;
+@@ -644,6 +645,10 @@
+       }
+     }
+ 
++  @ex = grep (/^gnu-configize$/, @exclude);
++  if ($#ex == -1) {
++    xsystem ("$gnuconfigize");
++  }
+ 
+   # -------------- #
+   # Running make.  #
diff --git a/packages/autoconf/autoconf-2.61/autoreconf-include.patch b/packages/autoconf/autoconf-2.61/autoreconf-include.patch
new file mode 100644
index 0000000000..5a7604b0fd
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/autoreconf-include.patch
@@ -0,0 +1,10 @@
+--- autoconf/bin/autoreconf.in~	2004-04-06 23:36:10.000000000 +0100
++++ autoconf/bin/autoreconf.in	2004-04-08 20:51:57.000000000 +0100
+@@ -179,6 +179,7 @@
+   $autoconf   .= join (' --prepend-include=', '', @prepend_include);
+   $autoheader .= join (' --include=', '', @include);
+   $autoheader .= join (' --prepend-include=', '', @prepend_include);
++  $aclocal    .= join (' -I ', '', @include);
+ 
+   # --install and --symlink;
+   if ($install)
diff --git a/packages/autoconf/autoconf-2.61/path_prog_fixes.patch b/packages/autoconf/autoconf-2.61/path_prog_fixes.patch
new file mode 100644
index 0000000000..5f0d055a48
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/path_prog_fixes.patch
@@ -0,0 +1,126 @@
+Index: autoconf-2.59/bin/autoheader.in
+===================================================================
+--- autoconf-2.59.orig/bin/autoheader.in	2005-03-09 16:27:17.933878952 -0500
++++ autoconf-2.59/bin/autoheader.in	2005-03-09 16:29:57.360642400 -0500
+@@ -1,8 +1,8 @@
+-#! @PERL@
++#! @bindir@/env perl
+ # -*- Perl -*-
+ # @configure_input@
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
+     if 0;
+ 
+ # autoheader -- create `config.h.in' from `configure.ac'
+Index: autoconf-2.59/bin/autom4te.in
+===================================================================
+--- autoconf-2.59.orig/bin/autom4te.in	2003-10-28 03:48:36.000000000 -0500
++++ autoconf-2.59/bin/autom4te.in	2005-03-09 16:30:14.957967200 -0500
+@@ -1,8 +1,10 @@
+-#! @PERL@ -w
++#! @bindir@/env perl
+ # -*- perl -*-
+ # @configure_input@
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++use warnings;
++
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
+     if 0;
+ 
+ # autom4te - Wrapper around M4 libraries.
+@@ -87,7 +89,7 @@
+ my $freeze = 0;
+ 
+ # $M4.
+-my $m4 = $ENV{"M4"} || '@M4@';
++my $m4 = $ENV{"M4"} || '@bindir@/env m4';
+ # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
+ fatal "need GNU m4 1.4 or later: $m4"
+   if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
+Index: autoconf-2.59/bin/autoreconf.in
+===================================================================
+--- autoconf-2.59.orig/bin/autoreconf.in	2005-03-09 16:27:17.354966960 -0500
++++ autoconf-2.59/bin/autoreconf.in	2005-03-09 16:31:19.572144352 -0500
+@@ -1,8 +1,10 @@
+-#! @PERL@ -w
++#! @bindir@/env perl
+ # -*- perl -*-
+ # @configure_input@
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++use warnings;
++
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
+     if 0;
+ 
+ # autoreconf - install the GNU Build System in a directory tree
+Index: autoconf-2.59/bin/autoscan.in
+===================================================================
+--- autoconf-2.59.orig/bin/autoscan.in	2003-09-26 08:57:49.000000000 -0400
++++ autoconf-2.59/bin/autoscan.in	2005-03-09 16:30:18.136483992 -0500
+@@ -1,4 +1,4 @@
+-#! @PERL@ -w
++#! @bindir@/env perl
+ # -*- perl -*-
+ # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
+ # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
+@@ -21,7 +21,9 @@
+ 
+ # Written by David MacKenzie <djm@gnu.ai.mit.edu>.
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++use warnings;
++
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
+     if 0;
+ 
+ BEGIN
+Index: autoconf-2.59/bin/autoupdate.in
+===================================================================
+--- autoconf-2.59.orig/bin/autoupdate.in	2003-08-27 07:26:32.000000000 -0400
++++ autoconf-2.59/bin/autoupdate.in	2005-03-09 16:30:19.912214040 -0500
+@@ -1,4 +1,4 @@
+-#! @PERL@ -w
++#! @bindir@/env perl
+ # -*- perl -*-
+ # autoupdate - modernize an Autoconf file.
+ # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
+@@ -22,7 +22,9 @@
+ # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
+ # Rewritten by Akim Demaille <akim@freefriends.org>.
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++use warnings;
++
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
+     if 0;
+ 
+ BEGIN
+@@ -54,7 +56,7 @@
+ my @include = ('@datadir@');
+ my $force = 0;
+ # m4.
+-my $m4 = $ENV{"M4"} || '@M4@';
++my $m4 = $ENV{"M4"} || '@bindir@/env m4';
+ 
+ 
+ # $HELP
+Index: autoconf-2.59/bin/ifnames.in
+===================================================================
+--- autoconf-2.59.orig/bin/ifnames.in	2003-10-10 09:52:56.000000000 -0400
++++ autoconf-2.59/bin/ifnames.in	2005-03-09 16:30:22.656796800 -0500
+@@ -1,8 +1,10 @@
+-#! @PERL@ -w
++#! @bindir@/env perl
+ # -*- perl -*-
+ # @configure_input@
+ 
+-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
++use warnings;
++
++eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
+     if 0;
+ 
+ # ifnames - print the identifiers used in C preprocessor conditionals
diff --git a/packages/autoconf/autoconf-2.61/program_prefix.patch b/packages/autoconf/autoconf-2.61/program_prefix.patch
new file mode 100644
index 0000000000..e6f4096a97
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/program_prefix.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- autoconf-2.57/lib/autoconf/general.m4~program_prefix
++++ autoconf-2.57/lib/autoconf/general.m4
+@@ -1676,8 +1676,9 @@
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+ test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
++  test "$target_alias" != "$host_alias" &&
++    test "$program_prefix$program_suffix$program_transform_name" = \
++      NONENONEs,x,x, &&
+   program_prefix=${target_alias}-[]dnl
+ ])# AC_CANONICAL_TARGET
+ 
diff --git a/packages/autoconf/autoconf-2.61/sizeof_types.patch b/packages/autoconf/autoconf-2.61/sizeof_types.patch
new file mode 100644
index 0000000000..30fd5c1926
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/sizeof_types.patch
@@ -0,0 +1,87 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4	2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4	2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
+ # Generic checks.  #
+ # ---------------- #
+ 
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++  if test "$build" = "$target"; then
++    ac_ct_$1=$$1
++    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++    $1=ac_ct_$1
++  else
++    $1="$3"
++  fi
++else
++  $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
++AC_DEFUN([AC_PROG_SIZE],
++[
++  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
++])
+ 
+ # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
+ # ---------------------------------------------------------------
+ AC_DEFUN([AC_CHECK_SIZEOF],
+-[AS_LITERAL_IF([$1], [],
++[AC_REQUIRE([AC_PROG_SIZE])
++AC_REQUIRE([AC_PROG_AWK])
++ AS_LITERAL_IF([$1], [],
+ 	       [AC_FATAL([$0: requires literal arguments])])dnl
+ AC_CHECK_TYPE([$1], [], [], [$3])
+ AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
+-[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  _AC_COMPUTE_INT([(long) (sizeof ($1))],
+-		  [AS_TR_SH([ac_cv_sizeof_$1])],
+-		  [AC_INCLUDES_DEFAULT([$3])],
+-		  [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++[
++if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
++	if test "$cross_compiling" = yes; then
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++			   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++			   ],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=0
++			   ])
++	else
++		# The cast to unsigned long works around a bug in the HP C Compiler
++		# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++		# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++		# This bug is HP SR number 8606223364.
++		_AC_COMPUTE_INT([(long) (sizeof ($1))],
++			[AS_TR_SH([ac_cv_sizeof_$1])],
++			[AC_INCLUDES_DEFAULT([$3])],
++			[AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++	fi
+ else
+   AS_TR_SH([ac_cv_sizeof_$1])=0
+-fi])dnl
++fi
++])dnl
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
+ 		   [The size of a `$1', as computed by sizeof.])
+ ])# AC_CHECK_SIZEOF
diff --git a/packages/autoconf/autoconf-native_2.59.bb b/packages/autoconf/autoconf-native_2.59.bb
index 92a9257797..aa4871e194 100644
--- a/packages/autoconf/autoconf-native_2.59.bb
+++ b/packages/autoconf/autoconf-native_2.59.bb
@@ -1,5 +1,5 @@
-SECTION = "devel"
 require autoconf_${PV}.bb
+
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
 
diff --git a/packages/autoconf/autoconf-native_2.61.bb b/packages/autoconf/autoconf-native_2.61.bb
new file mode 100644
index 0000000000..3efa04bdd2
--- /dev/null
+++ b/packages/autoconf/autoconf-native_2.61.bb
@@ -0,0 +1,17 @@
+require autoconf_${PV}.bb
+
+DEPENDS = "m4-native gnu-config-native"
+RDEPENDS_${PN} = "m4-native gnu-config-native"
+
+S = "${WORKDIR}/autoconf-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
+
+inherit native
+
+#
+# without it build break:
+# | make[1]: *** No rule to make target `../bin/autom4te', needed by `autoconf.in'.  Stop.
+#
+PARALLEL_MAKE = ""
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/autoconf/autoconf.inc b/packages/autoconf/autoconf.inc
new file mode 100644
index 0000000000..7761af06d7
--- /dev/null
+++ b/packages/autoconf/autoconf.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "A package of M4 macros to produce scripts to \
+automatically configure sourcecode."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/autoconf/"
+SECTION = "devel"
+DEPENDS += "m4-native"
+RDEPENDS_${PN} = "m4 gnu-config"
+
+SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
+	   file://program_prefix.patch;patch=1"
+
+inherit autotools
diff --git a/packages/autoconf/autoconf_2.57.bb b/packages/autoconf/autoconf_2.57.bb
index 48726b1605..6c2906a362 100644
--- a/packages/autoconf/autoconf_2.57.bb
+++ b/packages/autoconf/autoconf_2.57.bb
@@ -1,9 +1,2 @@
-SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
-	   file://program_prefix.patch;patch=1"
-LICENSE = "GPL"
-DESCRIPTION = "A package of M4 macros to produce scripts to \
-automatically configure sourcecode." 
-
+require autoconf.inc
 PR = "r1"
-SECTION = "devel"
-inherit autotools
diff --git a/packages/autoconf/autoconf_2.59.bb b/packages/autoconf/autoconf_2.59.bb
index 3a5c220a48..5891d1ec59 100644
--- a/packages/autoconf/autoconf_2.59.bb
+++ b/packages/autoconf/autoconf_2.59.bb
@@ -1,15 +1,10 @@
-DESCRIPTION = "A package of M4 macros to produce scripts to \
-automatically configure sourcecode."
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gnu.org/software/autoconf/"
-SECTION = "devel"
+require autoconf.inc
+
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 gnu-config"
 PR = "r5"
 
-SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
-	   file://program_prefix.patch;patch=1 \
-	   file://autoreconf-include.patch;patch=1 \
+SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://autoreconf-exclude.patch;patch=1 \
 	   file://autoreconf-foreign.patch;patch=1 \
 	   file://autoreconf-gnuconfigize.patch;patch=1 \
@@ -18,4 +13,3 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
 	   file://sizeof_types.patch;patch=1 \
 	   file://autoconf-x.patch;patch=1 \
 	   ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-inherit autotools
diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb
new file mode 100644
index 0000000000..370315f041
--- /dev/null
+++ b/packages/autoconf/autoconf_2.61.bb
@@ -0,0 +1,13 @@
+require autoconf.inc
+
+DEPENDS += "m4-native"
+RDEPENDS_${PN} = "m4 gnu-config"
+
+SRC_URI += "file://autoreconf-include.patch;patch=1 \
+	   file://autoreconf-exclude.patch;patch=1 \
+	   file://autoreconf-foreign.patch;patch=1 \
+	   file://autoreconf-gnuconfigize.patch;patch=1 \
+	   file://autoheader-nonfatal-warnings.patch;patch=1 \
+	   ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/automake/automake-native_1.9.6.bb b/packages/automake/automake-native_1.9.6.bb
new file mode 100644
index 0000000000..92c861f49c
--- /dev/null
+++ b/packages/automake/automake-native_1.9.6.bb
@@ -0,0 +1,3 @@
+PV := "${PV}"
+
+require automake-native.inc
diff --git a/packages/automake/automake_1.9.6.bb b/packages/automake/automake_1.9.6.bb
new file mode 100644
index 0000000000..eef69f4e4a
--- /dev/null
+++ b/packages/automake/automake_1.9.6.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+
+S = "${WORKDIR}/automake-${PV}"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+
+require automake.inc
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.9 ${D}${datadir}/automake
+	fi
+}
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
new file mode 100644
index 0000000000..19ef64f0e1
--- /dev/null
+++ b/packages/avahi/avahi.inc
@@ -0,0 +1,66 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
+HOMEPAGE = "http://avahi.org"
+SECTION = "network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "expat libdaemon dbus"
+RRECOMMENDS = "libnss-mdns"
+RRECOMMENDS_avahi-daemon = "libnss-mdns"
+
+SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
+
+inherit autotools pkgconfig update-rc.d
+
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+                      ${sysconfdir}/avahi/avahi-daemon.conf \
+                      ${sysconfdir}/avahi/hosts \
+                      ${sysconfdir}/avahi/services \
+                      ${sysconfdir}/dbus-1 \
+                      ${sysconfdir}/init.d/avahi-daemon \
+                      ${datadir}/avahi/introspection/*.introspect \
+                      ${datadir}/avahi/avahi-service.dtd \
+                      ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+                        ${sysconfdir}/avahi/avahi-dnsconfd.action \
+                        ${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_avahi-utils = "${bindir}/avahi-*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+# At the time the postinst runs, dbus might not be setup so only restart if running
+
+pkg_postinst_avahi-daemon () {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+	grep avahi /etc/group || addgroup avahi
+	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+
+	DBUSPID=`pidof dbus-daemon`
+
+	if [ "x$DBUSPID" != "x" ]; then
+		/etc/init.d/dbus-1 force-reload
+	fi
+}
+
+pkg_postrm_avahi-daemon () {
+	deluser avahi || true
+	delgroup avahi || true
+}
diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb
index 39ef299351..27dcdcffcb 100644
--- a/packages/avahi/avahi_0.6.10.bb
+++ b/packages/avahi/avahi_0.6.10.bb
@@ -1,65 +1,3 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-PR = "r1"
-
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/hosts \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
+require avahi.inc
 
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
+PR = "r1"
diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb
index 6132fda504..27dcdcffcb 100644
--- a/packages/avahi/avahi_0.6.11.bb
+++ b/packages/avahi/avahi_0.6.11.bb
@@ -1,65 +1,3 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-PR="r1"
+require avahi.inc
 
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/hosts \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
-_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
+PR = "r1"
diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb
index 97fe491577..aad7d2661c 100644
--- a/packages/avahi/avahi_0.6.12.bb
+++ b/packages/avahi/avahi_0.6.12.bb
@@ -1,66 +1,7 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-PR = "r2"
-
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/hosts \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
+require avahi.inc
 
+PR = "r2"
 
 do_stage() {
 	autotools_stage_all
 }
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb
index a758997b4c..076dc0d148 100644
--- a/packages/avahi/avahi_0.6.13.bb
+++ b/packages/avahi/avahi_0.6.13.bb
@@ -1,70 +1,7 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-PR = "r1"
-
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/hosts \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
+require avahi.inc
 
+PR = "r1"
 
 do_stage() {
 	autotools_stage_all
 }
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
diff --git a/packages/avahi/avahi_0.6.14.bb b/packages/avahi/avahi_0.6.14.bb
index 2b5d56fffd..e42f4bbc13 100644
--- a/packages/avahi/avahi_0.6.14.bb
+++ b/packages/avahi/avahi_0.6.14.bb
@@ -1,71 +1,8 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-SECTION = "network"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require avahi.inc
 
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS_avahi-daemon = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-inherit autotools pkgconfig update-rc.d
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-                      ${sysconfdir}/avahi/avahi-daemon.conf \
-                      ${sysconfdir}/avahi/hosts \
-                      ${sysconfdir}/avahi/services \
-                      ${sysconfdir}/dbus-1 \
-                      ${sysconfdir}/init.d/avahi-daemon \
-                      ${datadir}/avahi/introspection/*.introspect \
-                      ${datadir}/avahi/avahi-service.dtd \
-                      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-                        ${sysconfdir}/avahi/avahi-dnsconfd.action \
-                        ${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
 do_stage() {
 	autotools_stage_all
 }
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
diff --git a/packages/avahi/avahi_0.6.15.bb b/packages/avahi/avahi_0.6.15.bb
index 331018d23a..07a429e133 100644
--- a/packages/avahi/avahi_0.6.15.bb
+++ b/packages/avahi/avahi_0.6.15.bb
@@ -1,72 +1,10 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-SECTION = "network"
-PRIORITY = "optional"
-LICENSE = "GPL"
+require avahi.inc
 
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS_avahi-daemon = "libnss-mdns"
+SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0"
 
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
-	   file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0"
-
-inherit autotools pkgconfig update-rc.d
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-                      ${sysconfdir}/avahi/avahi-daemon.conf \
-                      ${sysconfdir}/avahi/hosts \
-                      ${sysconfdir}/avahi/services \
-                      ${sysconfdir}/dbus-1 \
-                      ${sysconfdir}/init.d/avahi-daemon \
-                      ${datadir}/avahi/introspection/*.introspect \
-                      ${datadir}/avahi/avahi-service.dtd \
-                      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-                        ${sysconfdir}/avahi/avahi-dnsconfd.action \
-                        ${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
 do_stage() {
 	autotools_stage_all
 }
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
-pkg_postinst_avahi-daemon () {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 force-reload
-	fi
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb
index 4e27d655b0..9189734dfa 100644
--- a/packages/avahi/avahi_0.6.5.bb
+++ b/packages/avahi/avahi_0.6.5.bb
@@ -1,49 +1 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-pkg_postinst_avahi-daemon () {
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
+require avahi.inc
diff --git a/packages/avahi/avahi_0.6.8.bb b/packages/avahi/avahi_0.6.8.bb
index 828ea4a39a..9189734dfa 100644
--- a/packages/avahi/avahi_0.6.8.bb
+++ b/packages/avahi/avahi_0.6.8.bb
@@ -1,53 +1 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "network"
-PRIORITY = "optional"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/hosts \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools pkgconfig update-rc.d
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-pkg_postinst_avahi-daemon () {
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
+require avahi.inc
diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc
index 02ad406170..007089761d 100644
--- a/packages/binutils/binutils.inc
+++ b/packages/binutils/binutils.inc
@@ -1,6 +1,11 @@
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+SECTION = "devel"
+LICENSE = "GPL"
+
 inherit autotools gettext
 
-PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+PACKAGES += "${PN}-symlinks"
 
 FILES_${PN} = " \
 	${bindir}/${TARGET_PREFIX}* \
@@ -28,6 +33,9 @@ FILES_${PN}-symlinks = " \
 	${bindir}/size \
 	${bindir}/strip"
 
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
 EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb
index c56f227d58..a03f355379 100644
--- a/packages/binutils/binutils_2.16.bb
+++ b/packages/binutils/binutils_2.16.bb
@@ -1,7 +1,3 @@
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-SECTION = "devel"
-LICENSE = "GPL"
 PR = "r7"
 
 SRC_URI = \
@@ -19,7 +15,4 @@ SRC_URI += "file://binutils-2.16-linux-uclibc.patch;patch=1"
 SRC_URI += "file://binutils-2.16-thumb-trampoline.patch;patch=1"
 SRC_URI += "file://binutils-2.16-thumb-glue.patch;patch=1"
 
-S = "${WORKDIR}/binutils-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
 require binutils.inc
diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb
index 87a333b035..2e61a3c7b2 100644
--- a/packages/binutils/binutils_2.17.50.0.5.bb
+++ b/packages/binutils/binutils_2.17.50.0.5.bb
@@ -1,39 +1,6 @@
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-SECTION = "devel"
-LICENSE = "GPL"
+require binutils.inc
 
-inherit autotools gettext
-
-PACKAGES += "${PN}-symlinks"
-
-FILES_${PN} = " \
-	${bindir}/${TARGET_PREFIX}* \
-	${libdir}/lib*-*.so \
-	${prefix}/${TARGET_SYS}/bin/*"
-
-FILES_${PN}-dev = " \
-	${includedir} \
-	${libdir}/*.a \
-	${libdir}/*.la \
-	${libdir}/libbfd.so \
-	${libdir}/libopcodes.so"
-
-FILES_${PN}-symlinks = " \
-	${bindir}/addr2line \
-	${bindir}/ar \
-	${bindir}/as \
-	${bindir}/c++filt \
-	${bindir}/gprof \
-	${bindir}/ld \
-	${bindir}/nm \
-	${bindir}/objcopy \
-	${bindir}/objdump \
-	${bindir}/ranlib \
-	${bindir}/readelf \
-	${bindir}/size \
-	${bindir}/strings \
-	${bindir}/strip"
+PR = "r1"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
@@ -44,87 +11,3 @@ SRC_URI = \
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
      "	
-
-S = "${WORKDIR}/binutils-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
-		--enable-shared"
-
-# This is necessary due to a bug in the binutils Makefiles
-EXTRA_OEMAKE = "configure-build-libiberty all"
-
-export AR = "${HOST_PREFIX}ar"
-export AS = "${HOST_PREFIX}as"
-export LD = "${HOST_PREFIX}ld"
-export NM = "${HOST_PREFIX}nm"
-export RANLIB = "${HOST_PREFIX}ranlib"
-export OBJCOPY = "${HOST_PREFIX}objcopy"
-export OBJDUMP = "${HOST_PREFIX}objdump"
-
-export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
-export AS_FOR_TARGET = "${TARGET_PREFIX}as"
-export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
-export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
-export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-
-export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-
-do_configure () {
-	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
-	oe_runconf
-#
-# must prime config.cache to ensure the build of libiberty
-#
-	mkdir -p ${B}/build-${BUILD_SYS}
-	for i in ${CONFIG_SITE}; do
-		cat $i >> ${B}/build-${BUILD_SYS}/config.cache
-	done
-
-}
-
-do_stage () {
-	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
-	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
-	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
-	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
-}
-
-do_install () {
-	autotools_do_install
-
-	# We don't really need these, so we'll remove them...
-	rm -rf ${D}${libdir}/ldscripts
-
-	# Fix the /usr/${TARGET_SYS}/bin/* links
-	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
-		rm -f $l
-		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
-			| tr -s / \
-			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
-	done
-
-	# Install the libiberty header
-	install -d ${D}${includedir}
-	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-
-	cd ${D}${bindir}
-
-	# Symlinks for ease of running these on the native target
-	for p in ${TARGET_SYS}-* ; do
-		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
-	done
-}
diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb
index d9e167f051..9610634959 100644
--- a/packages/binutils/binutils_2.17.bb
+++ b/packages/binutils/binutils_2.17.bb
@@ -1,7 +1,5 @@
-DESCRIPTION = "A GNU collection of binary utilities"
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-SECTION = "devel"
-LICENSE = "GPL"
+require binutils.inc
+
 PR = "r0"
 
 SRC_URI = \
@@ -24,9 +22,3 @@ SRC_URI += "\
 
 # Zecke's OSX fixes
 SRC_URI += " file://warning-free.patch;patch=1 "
-
-
-S = "${WORKDIR}/binutils-${PV}"
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-require binutils.inc
diff --git a/packages/bitbake/bitbake-package.inc b/packages/bitbake/bitbake-package.inc
deleted file mode 100644
index fa1e76b392..0000000000
--- a/packages/bitbake/bitbake-package.inc
+++ /dev/null
@@ -1 +0,0 @@
-FILES_${PN} += "${datadir}/bitbake"
diff --git a/packages/bitbake/bitbake.inc b/packages/bitbake/bitbake.inc
index 1c5c7ad2a6..2c5f523d4f 100644
--- a/packages/bitbake/bitbake.inc
+++ b/packages/bitbake/bitbake.inc
@@ -9,3 +9,14 @@ HOMEPAGE = "http://developer.berlios.de/projects/bitbake/"
 LICENSE = "GPL MIT"
 SECTION = "devel"
 SUMMARY = "BitBake build tool"
+RDEPENDS += "python-shell python-lang python-textutils python-pickle python-crypt python-netclient"
+
+# crypt for md5
+# netclient for tinderclient.bbclass
+
+# We don't need a toolchain...
+INHIBIT_DEFAULT_DEPS = "1"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}/bitbake"
diff --git a/packages/bitbake/bitbake_1.6.2.bb b/packages/bitbake/bitbake_1.6.2.bb
index f0fdfb9e76..6a6fffcfef 100644
--- a/packages/bitbake/bitbake_1.6.2.bb
+++ b/packages/bitbake/bitbake_1.6.2.bb
@@ -1,16 +1,7 @@
 require bitbake.inc
 
-PR = "r0"
-
-# We don't need a toolchain...
-INHIBIT_DEFAULT_DEPS = "1"
+PR = "r1"
 
 SRC_URI = "http://download.berlios.de/bitbake/bitbake-${PV}.tar.gz"
 
 S = "${WORKDIR}/bitbake-${PV}"
-
-inherit distutils
-
-require bitbake-package.inc
-
-RDEPENDS += "python-shell python-lang python-textutils  python-pickle"
diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb
index d43d03b0f3..d16471d405 100644
--- a/packages/bitbake/bitbake_svn.bb
+++ b/packages/bitbake/bitbake_svn.bb
@@ -1,16 +1,11 @@
 require bitbake.inc
 
+PV = "1.7.2+svn${SRCDATE}"
+PR = "r1"
+
 # Don't use the tip of svn by default
 DEFAULT_PREFERENCE = "-1"
 
-# We don't need a toolchain...
-INHIBIT_DEFAULT_DEPS = "1"
-
-PV = "1.7.0+svn${SRCDATE}"
 SRC_URI = "svn://svn.berlios.de/bitbake/trunk;module=bitbake"
-# SRC_URI = "svn+ssh://svn.berlios.de/bitbake/trunk;module=bitbake"
-S = "${WORKDIR}/bitbake"
 
-inherit distutils
-
-require bitbake-package.inc
+S = "${WORKDIR}/bitbake"
diff --git a/packages/blueprobe/blueprobe.inc b/packages/blueprobe/blueprobe.inc
new file mode 100644
index 0000000000..f619f7336c
--- /dev/null
+++ b/packages/blueprobe/blueprobe.inc
@@ -0,0 +1,3 @@
+SECTION = "base"
+LICENSE = "GPL"
+inherit gpe
diff --git a/packages/blueprobe/blueprobe_0.13.bb b/packages/blueprobe/blueprobe_0.13.bb
index e54d2ed066..50ea03e854 100644
--- a/packages/blueprobe/blueprobe_0.13.bb
+++ b/packages/blueprobe/blueprobe_0.13.bb
@@ -1,4 +1 @@
-SECTION = "base"
-LICENSE = "GPL"
-inherit gpe
-
+require blueprobe.inc
diff --git a/packages/blueprobe/blueprobe_0.14.bb b/packages/blueprobe/blueprobe_0.14.bb
index e54d2ed066..50ea03e854 100644
--- a/packages/blueprobe/blueprobe_0.14.bb
+++ b/packages/blueprobe/blueprobe_0.14.bb
@@ -1,4 +1 @@
-SECTION = "base"
-LICENSE = "GPL"
-inherit gpe
-
+require blueprobe.inc
diff --git a/packages/blueprobe/blueprobe_0.15.bb b/packages/blueprobe/blueprobe_0.15.bb
index 282387707a..e39407cc16 100644
--- a/packages/blueprobe/blueprobe_0.15.bb
+++ b/packages/blueprobe/blueprobe_0.15.bb
@@ -1,6 +1,4 @@
-SECTION = "base"
-LICENSE = "GPL"
-inherit gpe
+require blueprobe.inc
 
 PR = "r2"
 
diff --git a/packages/blueprobe/blueprobe_0.16.bb b/packages/blueprobe/blueprobe_0.16.bb
index 7ec102d0eb..db190332e7 100644
--- a/packages/blueprobe/blueprobe_0.16.bb
+++ b/packages/blueprobe/blueprobe_0.16.bb
@@ -1,6 +1,4 @@
-SECTION = "base"
-LICENSE = "GPL"
-inherit gpe
+require blueprobe.inc
 
 PR = "r1"
 
diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb
index f367e43698..ffd83b66ae 100644
--- a/packages/blueprobe/blueprobe_0.17.bb
+++ b/packages/blueprobe/blueprobe_0.17.bb
@@ -1,6 +1,4 @@
-SECTION = "base"
-LICENSE = "GPL"
-inherit gpe
+require blueprobe.inc
 
 PR = "r2"
 
diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb
new file mode 100644
index 0000000000..61233d21c5
--- /dev/null
+++ b/packages/boost/boost_1.33.1.bb
@@ -0,0 +1,153 @@
+# The Boost web site provides free peer-reviewed portable
+# C++ source libraries. The emphasis is on libraries which
+# work well with the C++ Standard Library. The libraries are
+# intended to be widely useful, and are in regular use by
+# thousands of programmers across a broad spectrum of applications.
+DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
+HOMEPAGE = "http://www.boost.org/"
+SECTION = "libs"
+DEPENDS = "boost-jam-native zlib"
+PRIORITY = "optional"
+LICENSE = "Boost Software License"
+PR = "r0"
+
+BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
+BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
+BOOST_P = "boost_${BOOST_VER}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
+#SRC_URI += "file://unit_test_log10f.patch;patch=1"
+SRC_URI += "file://linux-uclibc.patch;patch=1"
+
+S = "${WORKDIR}/${BOOST_P}"
+
+# Make a package for each library, plus -dev and -python
+PACKAGES =
+
+PACKAGES += "boost-date-time"
+FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}"
+
+PACKAGES += "boost-filesystem"
+FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}"
+
+PACKAGES += "boost-prg-exec-monitor"
+FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}"
+
+PACKAGES += "boost-program-options"
+FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}"
+
+PACKAGES += "boost-regex"
+FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}"
+
+PACKAGES += "boost-signals"
+FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}"
+
+PACKAGES += "boost-test-exec-monitor"
+FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}"
+
+PACKAGES += "boost-thread-mt"
+FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
+
+PACKAGES += "boost-unit-test-framework"
+FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
+
+PACKAGES += "boost-iostreams"
+FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
+
+PACKAGES += "boost-serialization"
+FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
+
+PACKAGES += "boost-wserialization"
+FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
+
+# Python - remove this and set:
+#PYTHON_ROOT = "/dev/null"
+# to remove the python build
+DEPENDS += "python"
+PYTHON_ROOT = "${STAGING_DIR}/${HOST_SYS}"
+PYTHON_VERSION = "2.4"
+
+PACKAGES += "boost-python"
+FILES_boost-python = "${libdir}/libboost_python.so.${PV}"
+
+# -dev last to pick up the remaining stuff
+PACKAGES += "${PN}-dev"
+FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+
+# Oh yippee, a new build system, it's sooo cooool I could eat my own
+# foot.  inlining=on lets the compiler choose, I think.  At least this
+# stuff is documented...
+# NOTE: if you leave <debug-symbols>on then in a debug build the build sys
+# objcopy will be invoked, and that won't work.  Building debug apparently
+# requires hacking gcc-tools.jam
+#
+# Sometimes I wake up screaming.  Famous figures are gathered in the nightmare,
+# Steve Bourne, Larry Wall, the whole of the ANSI C committee.  They're just
+# standing there, waiting, but the truely terrifying thing is what they carry
+# in their hands.  At first sight each seems to bear the same thing, but it is
+# not so for the forms in their grasp are ever so slightly different one from
+# the other.  Each is twisted in some grotesque way from the other to make each
+# an unspeakable perversion impossible to perceive without the onset of madness.
+# True insanity awaits anyone who perceives all of these horrors together.
+#
+# Quotation marks, there might be an easier way to do this, but I can't find
+# it.  The problem is that the user.hpp configuration file must receive a
+# pre-processor macro defined as the appropriate string - complete with "'s
+# around it.  (<> is a possibility here but the danger to that is that the
+# failure case interprets the < and > as shell redirections, creating 
+# random files in the source tree.)
+#
+#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"'
+#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'"
+SQD = '"'
+EQD = '\"'
+#boost.bb:   "...  '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..."
+BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}"
+
+# bzip2 and zip are disabled because... they're broken - the compilation simply
+# isn't working with bjam.  I guess they will fix it, but who needs it?  This
+# only affects the (new in 33) iostream library.
+BJAM_TOOLS   = "-sTOOLS=gcc \
+		'-sGCC=${CC} '${BJAM_CONF} \
+		'-sGXX=${CXX} '${BJAM_CONF} \
+		'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
+		'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
+		'-sNO_BZIP2=1' \
+		'-sNO_ZLIB=1' \
+		'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
+		'-sPYTHON_VERSION=${PYTHON_VERSION}' \
+		'--layout=system' \
+		"
+
+BJAM_OPTS    = '${BJAM_TOOLS} \
+		--builddir=${S}/${TARGET_SYS} \
+		--with-python-root=${PYTHON_ROOT} \
+		${BJAM_EXTRA}'
+
+
+do_configure_prepend() {
+	cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
+}
+
+do_compile() {
+	set -ex
+	bjam ${BJAM_OPTS} --prefix=${prefix} \
+		--exec-prefix=${exec_prefix} \
+		--libdir=${libdir} \
+		--includedir=${includedir}
+}
+
+do_stage() {
+	set -ex
+	bjam ${BJAM_OPTS} \
+		--libdir=${STAGING_LIBDIR} \
+		--includedir=${STAGING_INCDIR} \
+		install
+}
+
+do_install() {
+	set -ex
+	bjam ${BJAM_OPTS} \
+		--libdir=${D}${libdir} \
+		--includedir=${D}${includedir} \
+		install
+}
diff --git a/packages/cairo/cairo_1.3.6.bb b/packages/cairo/cairo_1.3.8.bb
index d9454fadcd..d9454fadcd 100644
--- a/packages/cairo/cairo_1.3.6.bb
+++ b/packages/cairo/cairo_1.3.8.bb
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index 71c65cdb9e..beb900b40d 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
-PV = "1.3.5+git${SRCDATE}"
+PV = "1.3.9+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "
diff --git a/packages/cdtool/cdtool_2.1.8pre4.bb b/packages/cdtool/cdtool_2.1.8.bb
index ec51290edf..ec51290edf 100644
--- a/packages/cdtool/cdtool_2.1.8pre4.bb
+++ b/packages/cdtool/cdtool_2.1.8.bb
diff --git a/packages/clamav/clamav_0.88.5.bb b/packages/clamav/clamav_0.88.7.bb
index e721558efe..fec4ae59d8 100644
--- a/packages/clamav/clamav_0.88.5.bb
+++ b/packages/clamav/clamav_0.88.7.bb
@@ -1,3 +1,3 @@
 require clamav.inc
 
-PR = "r1"
+PR = "r0"
diff --git a/packages/cmake/cmake-native_2.2.2.bb b/packages/cmake/cmake-native_2.2.3.bb
index fa0b63067d..b4e84cc093 100644
--- a/packages/cmake/cmake-native_2.2.2.bb
+++ b/packages/cmake/cmake-native_2.2.3.bb
@@ -7,11 +7,11 @@ HOMEPAGE = "http://www.cmake.org/"
 LICENSE = "Berkely-style license"
 SECTION = "console/utils"
 
-SRC_URI = "http://www.cmake.org/files/v2.2/cmake-2.2.1.tar.gz"
+SRC_URI = "http://www.cmake.org/files/v2.2/cmake-${PV}.tar.gz"
 
 inherit autotools
 
-S = "${WORKDIR}/cmake-2.2.1"
+S = "${WORKDIR}/cmake-${PV}"
 
 inherit native
 
diff --git a/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
new file mode 100644
index 0000000000..7d36dbdf22
--- /dev/null
+++ b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
@@ -0,0 +1,21 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=9142
+
+[..] the use case was the following. There
+are three processes A, B, and C. All of them add the same match (same value). A
+is started first, then B, and lastly C. Now, B and C are closed: if B is closed
+before C, A's match is removed; but if C is closed before B, A's match is not
+removed (no buggy behaviour). (B and C call dbus_bus_remove_match on exit.)
+
+diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
+--- 0.61-osso23/bus/signals.c	2006-11-23 16:46:52.589602192 +0200
++++ 0.61-osso23.new/bus/signals.c	2006-11-23 16:49:28.873843376 +0200
+@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
+   if (a->flags != b->flags)
+     return FALSE;
+ 
++  if (a->matches_go_to != b->matches_go_to)
++    return FALSE;
++
+   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
+       a->message_type != b->message_type)
+     return FALSE;
diff --git a/packages/dbus/dbus-0.95/.mtn2git_empty b/packages/dbus/dbus-1.0.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-0.95/.mtn2git_empty
+++ b/packages/dbus/dbus-1.0.2/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.95/cross.patch b/packages/dbus/dbus-1.0.2/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/packages/dbus/dbus-0.95/cross.patch
+++ b/packages/dbus/dbus-1.0.2/cross.patch
diff --git a/packages/dbus/dbus-0.95/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init
index 4829c0d4a8..38e7574ad5 100644
--- a/packages/dbus/dbus-0.95/dbus-1.init
+++ b/packages/dbus/dbus-1.0.2/dbus-1.init
@@ -10,6 +10,7 @@ NAME=dbus
 DAEMONUSER=messagebus
 PIDDIR=/var/run/dbus
 PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
 DESC="system message bus"
 EVENTDIR=/etc/dbus-1/event.d
 
@@ -40,8 +41,15 @@ start_it_up()
       rm -f $PIDFILE
     fi
   fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
  
   dbus-uuidgen --ensure  
+
   echo -n "Starting $DESC: "
   start-stop-daemon --start --quiet --pidfile $PIDFILE \
     --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
diff --git a/packages/dbus/dbus-0.95/fix-install-daemon.patch b/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/packages/dbus/dbus-0.95/fix-install-daemon.patch
+++ b/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index d87975a20e..8baf8d9feb 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -2,7 +2,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
+DEPENDS = "expat virtual/libintl"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.95.bb b/packages/dbus/dbus_0.95.bb
deleted file mode 100644
index 688e5c630f..0000000000
--- a/packages/dbus/dbus_0.95.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-DEFAULT_PREFERENCE = "-1"
-
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://tmpdir.patch;patch=1 \
-	   file://dbus-1.init \
-	   file://fix-segfault.patch;patch=1 \
-           file://cross.patch;patch=1 \
-	   file://fix-install-daemon.patch;patch=1"
-
-inherit autotools pkgconfig update-rc.d gettext
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "defaults"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
-
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
-
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
-
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-}
-
-EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x"
-
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-}
-
-python populate_packages_prepend () {
-	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-		bb.data.setVar('PKG_dbus', 'dbus-1', d)
-}
diff --git a/packages/dbus/dbus_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb
index 0198fa62c8..3c45ee8bd6 100644
--- a/packages/dbus/dbus_1.0.1.bb
+++ b/packages/dbus/dbus_1.0.1.bb
@@ -1,3 +1,5 @@
 require dbus.inc
 
-PR = "r1"
+SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
+
+PR = "r3"
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
new file mode 100644
index 0000000000..0198fa62c8
--- /dev/null
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -0,0 +1,3 @@
+require dbus.inc
+
+PR = "r1"
diff --git a/packages/eds/eds-dbus/no_libedataserverui-20060126.patch b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch
new file mode 100644
index 0000000000..bb6f78d9f7
--- /dev/null
+++ b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch
@@ -0,0 +1,13 @@
+Index: Makefile.am
+===================================================================
+--- trunk/Makefile.am	(revision 306)
++++ trunk/Makefile.am	(working copy)
+@@ -16,7 +16,7 @@
+ endif
+ 
+ if ENABLE_DBUS
+-SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po
++SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po
+ else
+ SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po
+ endif
diff --git a/packages/eds/eds-dbus/no_libedataserverui.patch b/packages/eds/eds-dbus/no_libedataserverui.patch
index bb6f78d9f7..766c547a56 100644
--- a/packages/eds/eds-dbus/no_libedataserverui.patch
+++ b/packages/eds/eds-dbus/no_libedataserverui.patch
@@ -6,8 +6,8 @@ Index: Makefile.am
  endif
  
  if ENABLE_DBUS
--SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po
-+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po
+-SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui docs art po
++SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) docs art po
  else
  SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po
  endif
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index e56b41e595..b97ed984bc 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -1,18 +1,17 @@
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
-DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib"
+DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool"
 
 PV = "1.4.0+svn${SRCDATE}"
-PR = "r17"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libdb.patch;patch=1 \
            file://no_iconv_test.patch;patch=1 \
-           file://no_libedataserverui.patch;patch=1 \
-           file://disable_orbit.patch;patch=1;maxdate=20060126 \
+           file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \
+           file://no_libedataserverui.patch;patch=1;mindate=20061215 \
+           file://disable_orbit.patch;patch=1;maxdate=20061214 \
            file://iconv-detect.h"
-
 S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
@@ -38,7 +37,6 @@ FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \
 do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
 
 do_stage () {
-	autotools_stage_all
+        autotools_stage_all
 }
 
-
diff --git a/packages/efl++/efl++-fb_0.1.0.bb b/packages/efl++/efl++-fb_0.1.0.bb
deleted file mode 100644
index a2e3a7dd34..0000000000
--- a/packages/efl++/efl++-fb_0.1.0.bb
+++ /dev/null
@@ -1 +0,0 @@
-require efl++.inc
diff --git a/packages/efl++/efl++-x11_0.1.0.bb b/packages/efl++/efl++-x11_0.1.0.bb
deleted file mode 100644
index 7f6c942790..0000000000
--- a/packages/efl++/efl++-x11_0.1.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require efl++.inc
-
-EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11"
diff --git a/packages/ethereal/ethereal_0.99.0.bb b/packages/ethereal/ethereal_0.99.0.bb
deleted file mode 100644
index a6748be077..0000000000
--- a/packages/ethereal/ethereal_0.99.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
-HOMEPAGE = "http://www.ethereal.com"
-SECTION = "x11/network"
-LICENSE = "GPL"
-DEPENDS = "perl-native gtk+ gnutls libpcap"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ethereal/ethereal-${PV}.tar.bz2 \
-           file://use-our-lemon.patch;patch=1"
-S = "${WORKDIR}/ethereal-${PV}"
-
-inherit autotools
-
-do_compile_prepend() {
-	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
-	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}"
-}
-
diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb
new file mode 100644
index 0000000000..c932aeaf22
--- /dev/null
+++ b/packages/ezx/opentapi_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Open implementation of motorola's tapisrc"
+LICENSE = "GPLv2"
+
+PV = "0.0+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 755 opentapi ${D}${bindir}	
+}	
+
diff --git a/packages/findutils/findutils-4.1.20/configure.patch b/packages/findutils/findutils-4.1.20/configure.patch
deleted file mode 100644
index de9d6afae4..0000000000
--- a/packages/findutils/findutils-4.1.20/configure.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- findutils-4.1.20/./configure.in~configure
-+++ findutils-4.1.20/./configure.in
-@@ -1,5 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(find/pred.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([find/pred.c])
- AM_CONFIG_HEADER(config.h)
- AC_CANONICAL_HOST
- 
-@@ -23,7 +24,7 @@
- AC_AIX
- AC_MINIX
- AC_ISC_POSIX
--AC_PROG_CC_STDC
-+
- AM_C_PROTOTYPES
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-@@ -48,25 +49,25 @@
- AC_MSG_CHECKING(how to get filesystem type)
- fstype=no
- # The order of these tests is important.
--AC_TRY_CPP([#include <sys/statvfs.h>
--#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_STATVFS, 1, [Define to use SVR4 statvfs to get filesystem type.]) fstype=SVR4)
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statvfs.h>
-+#include <sys/fstyp.h>]])],[AC_DEFINE(FSTYPE_STATVFS, 1, Define to use SVR4 statvfs to get filesystem type.) fstype=SVR4],[])
- if test $fstype = no; then
--AC_TRY_CPP([#include <sys/statfs.h>
--#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_USG_STATFS, 1, [Define to use SVR3.2 statfs to get filesystem type.]) fstype=SVR3)
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statfs.h>
-+#include <sys/fstyp.h>]])],[AC_DEFINE(FSTYPE_USG_STATFS, 1, Define to use SVR3.2 statfs to get filesystem type.) fstype=SVR3],[])
- fi
- if test $fstype = no; then
--AC_TRY_CPP([#include <sys/statfs.h>
--#include <sys/vmount.h>], AC_DEFINE(FSTYPE_AIX_STATFS, 1, [Define to use AIX3 statfs to get filesystem type.]) fstype=AIX)
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/statfs.h>
-+#include <sys/vmount.h>]])],[AC_DEFINE(FSTYPE_AIX_STATFS, 1, Define to use AIX3 statfs to get filesystem type.) fstype=AIX],[])
- fi
- if test $fstype = no; then  
--AC_TRY_CPP([#include <mntent.h>], AC_DEFINE(FSTYPE_MNTENT, 1, [Define to use 4.3BSD getmntent to get filesystem type.]) fstype=4.3BSD)
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <mntent.h>]])],[AC_DEFINE(FSTYPE_MNTENT, 1, Define to use 4.3BSD getmntent to get filesystem type.) fstype=4.3BSD],[])
- fi
- if test $fstype = no; then  
- AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, 1, [Define to use 4.4BSD and OSF1 statfs to get filesystem type.]) fstype=4.4BSD/OSF1)
- fi
- if test $fstype = no; then  
--AC_TRY_CPP([#include <sys/mount.h>
--#include <sys/fs_types.h>], AC_DEFINE(FSTYPE_GETMNT, 1, [Define to use Ultrix getmnt to get filesystem type.]) fstype=Ultrix)
-+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/mount.h>
-+#include <sys/fs_types.h>]])],[AC_DEFINE(FSTYPE_GETMNT, 1, Define to use Ultrix getmnt to get filesystem type.) fstype=Ultrix],[])
- fi
- AC_MSG_RESULT($fstype)
- 
-@@ -105,11 +106,11 @@
- # the ANSI2KNR-filtering rules.
- #LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
- AC_CONFIG_SUBDIRS(gnulib)
--AC_OUTPUT(
--	Makefile 
-+AC_CONFIG_FILES([Makefile 
- 	find/Makefile find/testsuite/Makefile
- 	xargs/Makefile xargs/testsuite/Makefile
- 	locate/Makefile locate/testsuite/Makefile
- 	intl/Makefile po/Makefile.in po/Makefile
- 	doc/Makefile lib/Makefile
--	)
-+	])
-+AC_OUTPUT
---- findutils-4.1.20/./gnulib/configure.ac~configure
-+++ findutils-4.1.20/./gnulib/configure.ac
-@@ -1,5 +1,5 @@
- # Process this file with autoconf to produce a configure script.
--AC_INIT(dummy,0)
-+AC_INIT([dummy],[0])
- AM_INIT_AUTOMAKE
- 
- AM_CONFIG_HEADER(config.h)
-@@ -95,4 +95,5 @@
- gl_YESNO
- 
- 
--AC_OUTPUT([Makefile lib/Makefile m4/Makefile po/Makefile])
-+AC_CONFIG_FILES([Makefile lib/Makefile m4/Makefile po/Makefile])
-+AC_OUTPUT
diff --git a/packages/findutils/findutils-4.1.20/make.patch b/packages/findutils/findutils-4.1.20/make.patch
deleted file mode 100644
index ecebe3b460..0000000000
--- a/packages/findutils/findutils-4.1.20/make.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: findutils-4.1.20/locate/testsuite/Makefile.am
-===================================================================
---- findutils-4.1.20.orig/locate/testsuite/Makefile.am	2001-06-05 02:10:07.000000000 -0400
-+++ findutils-4.1.20/locate/testsuite/Makefile.am	2005-03-11 19:29:30.827233552 -0500
-@@ -13,6 +13,6 @@
- 	locate.gnu/ignore_case3.exp \
- 	locate.gnu/ignore_case3.xo
- 
--DIST_SUBDIRS = config inputs locate.gnu
-+DIST_SUBDIRS = config locate.gnu
- 
- CLEANFILES = *.log *.sum site.exp site.bak
diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.2.29.bb
index 5a268cda92..cb6d72f1e9 100644
--- a/packages/findutils/findutils-native_4.1.20.bb
+++ b/packages/findutils/findutils-native_4.2.29.bb
@@ -1,4 +1,7 @@
-require findutils_${PV}.bb
+require findutils.inc
+
 inherit native
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
+
 S = "${WORKDIR}/findutils-${PV}"
diff --git a/packages/findutils/findutils.inc b/packages/findutils/findutils.inc
new file mode 100644
index 0000000000..e054dd0cc7
--- /dev/null
+++ b/packages/findutils/findutils.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "find, locate, and xargs binaries."
+SECTION = "console/utils"
+LICENSE = "GPL"
+
+SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
+
+inherit autotools gettext
+
+# diffutils assumes non-glibc compilation with uclibc and
+# this causes it to generate its own implementations of
+# standard functionality.  regex.c actually breaks compilation
+# because it uses __mempcpy, there are other things (TBD:
+# see diffutils.mk in buildroot)
+EXTRA_OECONF_linux-uclibc = "--without-included-regex"
diff --git a/packages/findutils/findutils_4.1.20.bb b/packages/findutils/findutils_4.1.20.bb
deleted file mode 100644
index 0ea93f44d3..0000000000
--- a/packages/findutils/findutils_4.1.20.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "console/utils"
-LICENSE = "GPL"
-DESCRIPTION = "find, locate, and xargs binaries."
-PR = "r3"
-
-SRC_URI = "ftp://alpha.gnu.org/gnu/findutils/findutils-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://make.patch;patch=1"
-
-inherit autotools gettext
-
-# diffutils assumes non-glibc compilation with uclibc and
-# this causes it to generate its own implementations of
-# standard functionality.  regex.c actually breaks compilation
-# because it uses __mempcpy, there are other things (TBD:
-# see diffutils.mk in buildroot)
-EXTRA_OECONF_linux-uclibc = "--without-included-regex"
-
-do_install_append () {
-        mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
-        mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
-}
-
-pkg_postinst_${PN} () {
-	for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-}
-
-pkg_prerm_${PN} () {
-	for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
-}
diff --git a/packages/findutils/findutils_4.2.29.bb b/packages/findutils/findutils_4.2.29.bb
new file mode 100644
index 0000000000..2f40d03bd4
--- /dev/null
+++ b/packages/findutils/findutils_4.2.29.bb
@@ -0,0 +1,14 @@
+require findutils.inc
+
+do_install_append () {
+        mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
+        mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
+}
+
+pkg_postinst_${PN} () {
+	for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
+}
+
+pkg_prerm_${PN} () {
+	for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
+}
diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb
index 1e2c36b711..95a39c376d 100644
--- a/packages/gallery/gallery_1.5.5.bb
+++ b/packages/gallery/gallery_1.5.5.bb
@@ -1,21 +1,23 @@
-SECTION = "apps"
 DESCRIPTION = "The Gallery v1 web image gallery"
+SECTION = "apps"
 LICENSE = "GPL"
-#
 RDEPENDS = "apache2 modphp imagemagick jhead"
-
 PR = "r1"
+
+SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-pl1.tar.gz"
+
 S = "${WORKDIR}/gallery"
-HTTPCONF=/etc/apache2/httpd.conf
-DEST_DIR=/usr/share/apache2/htdocs/
+
+inherit autotools 
+
+HTTPCONF = "/etc/apache2/httpd.conf"
+DEST_DIR = "/usr/share/apache2/htdocs/"
+
 #
 # don't list the albums as a file - it might get auto-deleted
 #
 FILES_${PN} = "${DEST_DIR}/gallery /etc/apache2/modules.d"
 
-SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-pl1.tar.gz"
-
-inherit autotools 
 
 # No configure step for gallery
 do_configure() {
diff --git a/packages/gbluezconf/gbluezconf_00.10.bb b/packages/gbluezconf/gbluezconf_00.10.bb
deleted file mode 100644
index 1f6ecaf661..0000000000
--- a/packages/gbluezconf/gbluezconf_00.10.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "GTK panel applet to control bluetooth stuff"
-LICENSE = "GPLv2"
-
-DEPENDS = "bluez-utils-dbus libglade dbus libnotify popt gtk+"
-SRC_URI = "http://www.cin.ufpe.br/~ckt/gbluezconf/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-
-
-
diff --git a/packages/gcc/gcc-4.1-20060217/arm-nolibfloat.patch b/packages/gcc/gcc-4.1-20060217/arm-nolibfloat.patch
deleted file mode 100644
index c4897c0330..0000000000
--- a/packages/gcc/gcc-4.1-20060217/arm-nolibfloat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Dimitry Andric <dimitry@andric.com>, 2004-05-01
-#
-# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
-#   anymore.  (The required functions are now in libgcc.)
-# 
-# Fixes errors like
-# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
-# collect2: ld returned 1 exit status
-# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
-# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
-
-Index: gcc-4.0.2/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h	2005-03-04 16:14:01.000000000 +0000
-+++ gcc-4.0.2/gcc/config/arm/linux-elf.h	2005-11-11 18:02:54.000000000 +0000
-@@ -56,7 +56,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
-    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
diff --git a/packages/gcc/gcc-4.1-20060217/arm-softfloat.patch b/packages/gcc/gcc-4.1-20060217/arm-softfloat.patch
deleted file mode 100644
index c86c83ed15..0000000000
--- a/packages/gcc/gcc-4.1-20060217/arm-softfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc-4.0.2/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.0.2.orig/gcc/config/arm/t-linux	2004-05-15 12:41:35.000000000 +0000
-+++ gcc-4.0.2/gcc/config/arm/t-linux	2005-11-11 16:07:53.000000000 +0000
-@@ -4,7 +4,10 @@
- LIBGCC2_DEBUG_CFLAGS = -g0
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+    _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+    _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+    _fixsfsi _fixunssfsi _floatdidf _floatdisf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/packages/gcc/gcc-4.1-20060217/ldflags.patch b/packages/gcc/gcc-4.1-20060217/ldflags.patch
deleted file mode 100644
index 9576f60778..0000000000
--- a/packages/gcc/gcc-4.1-20060217/ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.in	2006-02-23 20:56:01.399758728 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-02-23 20:56:16.874406224 +0100
-@@ -334,7 +334,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
---- /tmp/Makefile.tpl	2006-02-23 20:50:34.077519272 +0100
-+++ gcc-4.1-20060217/Makefile.tpl	2006-02-23 21:04:31.092273688 +0100
-@@ -337,7 +337,7 @@
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch b/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch
deleted file mode 100644
index 6afb10d6ef..0000000000
--- a/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: gcc-4.0.2/gcc/c-incpath.c
-===================================================================
---- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
-+++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
-@@ -350,6 +350,26 @@
-   p->construct = 0;
-   p->user_supplied_p = user_supplied_p;
- 
-+#ifdef CROSS_COMPILE
-+    /* A common error when cross compiling is including
-+    host headers. This code below will try to fail fast
-+    for cross compiling. Currently we consider /usr/include,
-+    /opt/include and /sw/include as harmful.  */
-+	{
-+		/* printf("Adding Path: %s\n", p->name ); */
-+		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
-+			abort();
-+		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
-+			abort();
-+		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
-+			abort();
-+		 }
-+	}
-+#endif
-+
-   add_cpp_dir_path (p, chain);
- }
- 
diff --git a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
deleted file mode 100644
index 8b53f653c6..0000000000
--- a/packages/gcc/gcc-4.1-20060217/zecke-xgcc-cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gcc-4.1-20060217/Makefile.in
-===================================================================
---- gcc-4.1-20060217.orig/Makefile.in	2005-12-15 15:02:02.000000000 +0100
-+++ gcc-4.1-20060217/Makefile.in	2006-08-06 13:23:23.000000000 +0200
-@@ -194,6 +194,7 @@
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET)"; export CC; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
- 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch
new file mode 100644
index 0000000000..c1e1dec408
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch
@@ -0,0 +1,26 @@
+Submitted By: Alexander E. Patrakov
+Date: 2006-12-11
+Initial Package Version: 4.1.1
+Upstream Status: backport
+Origin: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28621
+Description: Fix crash of programs compiled with -Os -ffast-math
+(affects procps on the LiveCD)
+--- gcc-4.1.1/gcc/config/i386/i386.c
++++ gcc-4.1.1/gcc/config/i386/i386.c
+@@ -1502,12 +1502,10 @@
+     }
+ 
+   /* Validate -mpreferred-stack-boundary= value, or provide default.
+-     The default of 128 bits is for Pentium III's SSE __m128, but we
+-     don't want additional code to keep the stack aligned when
+-     optimizing for code size.  */
+-  ix86_preferred_stack_boundary = (optimize_size
+-				   ? TARGET_64BIT ? 128 : 32
+-				   : 128);
++     The default of 128 bits is for Pentium III's SSE __m128, We can't
++     change it because of optimize_size.  Otherwise, we can't mix object
++     files compiled with -Os and -On.  */
++  ix86_preferred_stack_boundary = 128;
+   if (ix86_preferred_stack_boundary_string)
+     {
+       i = atoi (ix86_preferred_stack_boundary_string);
diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb
deleted file mode 100644
index 037f3032a6..0000000000
--- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-                --disable-libmudflap \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb
deleted file mode 100644
index d2dc240126..0000000000
--- a/packages/gcc/gcc-cross_4.1-20060217.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require gcc_${PV}.bb
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-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"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# cross build
-require gcc3-build-cross.inc
-# cross packaging
-require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 2f29e172a3..5721dee50b 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 = "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_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb
deleted file mode 100644
index 6889f04a36..0000000000
--- a/packages/gcc/gcc_4.1-20060217.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-PR = "r0"
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-DEFAULT_PREFERENCE = "-99999"
-
-inherit autotools gettext
-
-require gcc-package.inc
-
-SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \
-	file://arm-nolibfloat.patch;patch=1 \
-	file://arm-softfloat.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
-	file://ldflags.patch;patch=1"
-
-SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-
-require gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 81b81eebcd..e32353325a 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -30,7 +30,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://unbreak-armv4t.patch;patch=1 \
         file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-        "
+        file://gcc-4.1.1-pr13685-1.patch;patch=1 \
+	"
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
diff --git a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb b/packages/geode-drivers/geode-v4l2lx_2.6.11.bb
deleted file mode 100644
index 8b775a703c..0000000000
--- a/packages/geode-drivers/geode-v4l2lx_2.6.11.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-# V4L2 OE build file for the AMD Geode LX
-# Copyright (C) 2005-2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION = "Linux video capture/overlay driver for the AMD Geode LX"
-HOMEPAGE = "http://www.amd.com/embedded"
-
-PR = "r0"
-AMD_DRIVER_VERSION = "03.02.0100"
-AMD_DRIVER_LABEL = "Graphics_Video4Linux2_LX_${AMD_DRIVER_VERSION}"
-
-require geode-modules.inc
-
-S="${WORKDIR}/${AMD_DRIVER_LABEL}/lxv4l2"
-
-export EXTRA_CFLAGS += " -DLINUX_2_6=1"
\ No newline at end of file
diff --git a/packages/git/files/Makefile.patch b/packages/git/files/Makefile.patch
deleted file mode 100644
index e360ae917d..0000000000
--- a/packages/git/files/Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git-snapshot-20051008/Makefile
-===================================================================
---- git-snapshot-20051008.orig/Makefile	2005-10-06 00:57:23.000000000 +0100
-+++ git-snapshot-20051008/Makefile	2005-10-08 22:03:50.000000000 +0100
-@@ -332,7 +332,7 @@
- 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
- 
- git-%$X: %.o $(LIB_FILE)
--	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
- 
- git-mailinfo$X : SIMPLE_LIB += $(LIB_4_ICONV)
- $(SIMPLE_PROGRAMS) : $(LIB_FILE)
diff --git a/packages/git/git-native_1.4.4.2.bb b/packages/git/git-native_1.4.4.2.bb
new file mode 100644
index 0000000000..f91fd03ab1
--- /dev/null
+++ b/packages/git/git-native_1.4.4.2.bb
@@ -0,0 +1,3 @@
+require git.inc
+inherit native
+DEPENDS = "openssl-native curl-native"
diff --git a/packages/git/git-native_snapshot.bb b/packages/git/git-native_snapshot.bb
deleted file mode 100644
index 84e6f96686..0000000000
--- a/packages/git/git-native_snapshot.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require git_snapshot.bb
-inherit native
-DEPENDS = "expat-native openssl-native curl-native"
-
-do_stage () {
-	oe_runmake install bindir=${STAGING_BINDIR} \
-		template_dir=${STAGING_DIR}/${BUILD_SYS}/share/git-core/templates/ \
-		GIT_PYTHON_DIR=${STAGING_DIR}/${BUILD_SYS}/share/git-core/python
-}
diff --git a/packages/git/git.inc b/packages/git/git.inc
new file mode 100644
index 0000000000..384dfaaeec
--- /dev/null
+++ b/packages/git/git.inc
@@ -0,0 +1,15 @@
+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"
+S = "${WORKDIR}/git-${PV}"
+
+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/git/git_1.4.4.2.bb b/packages/git/git_1.4.4.2.bb
new file mode 100644
index 0000000000..37f71cfb04
--- /dev/null
+++ b/packages/git/git_1.4.4.2.bb
@@ -0,0 +1,3 @@
+require git.inc
+DEPENDS = "openssl curl"
+RDEPENDS = "perl perl-module-file-path"
diff --git a/packages/git/git_snapshot.bb b/packages/git/git_snapshot.bb
deleted file mode 100644
index c9048a4673..0000000000
--- a/packages/git/git_snapshot.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "console/utils"
-LICENSE = "GPL"
-DESCRIPTION = "The git revision control system used by the Linux kernel developers"
-DEPENDS = "openssl curl"
-RDEPENDS = "perl \
-	    perl-module-file-path \
-	    "
-
-PR = "r2"
-
-def get_git_pkgdate(d):
-    import bb
-    srcdate = bb.data.getVar('SRCDATE', d, 1)
-    return "-".join([srcdate[0:4], srcdate[4:6], srcdate[6:8]])
-
-PKGDATE = "${@get_git_pkgdate(d)}"
-
-SRC_URI = "http://www.codemonkey.org.uk/projects/git-snapshots/git/git-${PKGDATE}.tar.gz"
-PV = "1.4.3.5+snapshot${PKGDATE}"
-
-S = "${WORKDIR}/git-${PKGDATE}"
-
-FILES_${PN} += "${datadir}/git-core"
-
-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
-}
-
diff --git a/packages/glib-2.0/glib-2.0_2.12.6.bb b/packages/glib-2.0/glib-2.0_2.12.6.bb
new file mode 100644
index 0000000000..aae16bf2f5
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.12.6.bb
@@ -0,0 +1,6 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"
+		      
diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc
new file mode 100644
index 0000000000..6a33291d52
--- /dev/null
+++ b/packages/glib-2.0/glib.inc
@@ -0,0 +1,40 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+require glib-2.0.inc
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc
new file mode 100644
index 0000000000..4e785d8275
--- /dev/null
+++ b/packages/glibc/glibc.inc
@@ -0,0 +1,5 @@
+DESCRIPTION = "GNU C Library"
+HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
+SECTION = "libs"
+PRIORITY = "required"
+LICENSE = "LGPL"
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 10e2e2e351..de6765b77e 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,10 +1,7 @@
+require glibc.inc
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
 PR = "r10"
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 471262373c..40fef7bed4 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 9f42e00e35..12db1928c6 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
+
 PR = "r11"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index a6950c558d..9286fce398 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index aa119f0a7b..6382d12e57 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 4d401d11f0..f955a6e0a0 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
+
 DEFAULT_PREFERENCE_i586 = "0"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 22ae2c5c38..7c2bf09e4e 100644
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -1,9 +1,6 @@
+require glibc.inc
+
 PR = "r8"
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 8e86c6457b..985df1dfaa 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index c33cef74ca..4cf0b82b92 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
+
 PR = "r12"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index 815038f0a6..d3c6ab02ec 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -1,8 +1,5 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
+
 PR = "r4"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 26f03ab0c1..c85aa500f1 100644
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "GNU C Library"
-HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
+require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 PR = "r5"
diff --git a/packages/ethereal/.mtn2git_empty b/packages/gnome/libart-lgpl/powerpc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ethereal/.mtn2git_empty
+++ b/packages/gnome/libart-lgpl/powerpc/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/powerpc/art_config.h b/packages/gnome/libart-lgpl/powerpc/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/powerpc/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/gnome/libsoup_2.2.98.bb b/packages/gnome/libsoup_2.2.98.bb
index 581644ede5..2cddb02ac4 100644
--- a/packages/gnome/libsoup_2.2.98.bb
+++ b/packages/gnome/libsoup_2.2.98.bb
@@ -13,6 +13,7 @@ FILES_${PN}-dev = "${includedir}/ ${libdir}/"
 FILES_${PN}-doc = "${datadir}/"
 
 do_stage() {
+	rm -f ${STAGING_DATADIR}/pkgconfig/libsoup*
 	autotools_stage_all
 	ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc
 }
diff --git a/packages/gpe-mileage/gpe-mileage_0.1.bb b/packages/gpe-mileage/gpe-mileage_0.1.bb
deleted file mode 100644
index 2e452219df..0000000000
--- a/packages/gpe-mileage/gpe-mileage_0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "A mileage calculator for GPE"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "gpe"
-
-DEPENDS = "glib-2.0 gtk+ libglade sqlite"
-
-inherit gpe autotools
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
new file mode 100644
index 0000000000..7c548acf7d
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb
@@ -0,0 +1,2 @@
+require gst-plugins.inc
+DEPENDS += "gst-plugins-base"
diff --git a/packages/gstreamer/gst-plugins-base_0.10.11.bb b/packages/gstreamer/gst-plugins-base_0.10.11.bb
new file mode 100644
index 0000000000..4286a50c61
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-base_0.10.11.bb
@@ -0,0 +1,7 @@
+require gst-plugins.inc
+PROVIDES += "gst-plugins"
+
+do_stage() {
+       autotools_stage_all
+}
+
diff --git a/packages/gstreamer/gst-plugins-good_0.10.4.bb b/packages/gstreamer/gst-plugins-good_0.10.4.bb
new file mode 100644
index 0000000000..7c548acf7d
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-good_0.10.4.bb
@@ -0,0 +1,2 @@
+require gst-plugins.inc
+DEPENDS += "gst-plugins-base"
diff --git a/packages/gstreamer/gstreamer.inc b/packages/gstreamer/gstreamer.inc
new file mode 100644
index 0000000000..36c7dcfac7
--- /dev/null
+++ b/packages/gstreamer/gstreamer.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.gstreamer.net/"
+DEPENDS = "libxml2 glib-2.0 gettext-native popt"
+
+# until we have decided a final naming scheme,
+# don't use 0.10.x package as a replacement for
+# version 0.8
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
diff --git a/packages/gstreamer/gstreamer_0.10.11.bb b/packages/gstreamer/gstreamer_0.10.11.bb
new file mode 100644
index 0000000000..d44630fbe2
--- /dev/null
+++ b/packages/gstreamer/gstreamer_0.10.11.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+HOMEPAGE = "http://www.gstreamer.net/"
+DEPENDS = "libxml2 glib-2.0 gettext-native popt"
+
+PR = "r0"
+# until we have decided a final naming scheme, 
+# don't use this package as a replacement for
+# version 0.8
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR} \
+	       mandir=${STAGING_DIR}/share/man
+}
+
+FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
diff --git a/packages/gstreamer/gstreamer_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb
index 1b930cf5aa..fcb5ad79ba 100644
--- a/packages/gstreamer/gstreamer_0.10.4.bb
+++ b/packages/gstreamer/gstreamer_0.10.4.bb
@@ -1,27 +1 @@
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "glib-2.0 gettext-native popt"
-
-PR = "r0"
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/share/man
-}
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+require gstreamer.inc
diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb
index 3273690400..fcb5ad79ba 100644
--- a/packages/gstreamer/gstreamer_0.10.5.bb
+++ b/packages/gstreamer/gstreamer_0.10.5.bb
@@ -1,30 +1 @@
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "glib-2.0 gettext-native popt"
-
-PR = "r0"
-# until we have decided a final naming scheme, 
-# don't use this package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/share/man
-}
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+require gstreamer.inc
diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb
index d44630fbe2..fcb5ad79ba 100644
--- a/packages/gstreamer/gstreamer_0.10.6.bb
+++ b/packages/gstreamer/gstreamer_0.10.6.bb
@@ -1,30 +1 @@
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "libxml2 glib-2.0 gettext-native popt"
-
-PR = "r0"
-# until we have decided a final naming scheme, 
-# don't use this package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/share/man
-}
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+require gstreamer.inc
diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb
index d44630fbe2..fcb5ad79ba 100644
--- a/packages/gstreamer/gstreamer_0.10.8.bb
+++ b/packages/gstreamer/gstreamer_0.10.8.bb
@@ -1,30 +1 @@
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-SECTION = "multimedia"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "libxml2 glib-2.0 gettext-native popt"
-
-PR = "r0"
-# until we have decided a final naming scheme, 
-# don't use this package as a replacement for
-# version 0.8
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-	       mandir=${STAGING_DIR}/share/man
-}
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+require gstreamer.inc
diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc
new file mode 100644
index 0000000000..843274fdc5
--- /dev/null
+++ b/packages/gtkmm/gtkmm.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "C++ bindings for the GTK+ toolkit."
+HOMEPAGE = "http://www.gtkmm.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "glibmm"
+
+inherit autotools pkgconfig flow-lossage
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
+
+LIBV = "2.4.0"
diff --git a/packages/gtkmm/gtkmm_2.4.8.bb b/packages/gtkmm/gtkmm_2.4.8.bb
index c16dde33b0..1c5a2a2b10 100644
--- a/packages/gtkmm/gtkmm_2.4.8.bb
+++ b/packages/gtkmm/gtkmm_2.4.8.bb
@@ -1,19 +1,6 @@
-LICENSE = "LGPL"
-DESCRIPTION = "C++ bindings for the GTK+ toolkit."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glibmm"
-PR = "r0"
+require gtkmm.inc
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-${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"
+SRC_URI = "${GNOME_MIRROR}/gtkmm/2.4/gtkmm-${PV}.tar.bz2"
 
 do_stage () {
 	oe_libinstall -so -C atk/atkmm libatkmm-1.6 ${STAGING_LIBDIR}
diff --git a/packages/gtkmm/gtkmm_2.8.3.bb b/packages/gtkmm/gtkmm_2.8.3.bb
index 41285736b5..dae68298c8 100644
--- a/packages/gtkmm/gtkmm_2.8.3.bb
+++ b/packages/gtkmm/gtkmm_2.8.3.bb
@@ -1,19 +1,8 @@
-LICENSE = "LGPL"
-DESCRIPTION = "C++ bindings for the GTK+ toolkit."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glibmm"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.8/gtkmm-${PV}.tar.bz2"
+require gtkmm.inc
 
-inherit autotools pkgconfig flow-lossage
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
+PR = "r1"
 
-LIBV = "2.4.0"
+SRC_URI = "${GNOME_MIRROR}/gtkmm/2.8/gtkmm-${PV}.tar.bz2"
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/hvsc/hvsc_5.8.bb b/packages/hvsc/hvsc_45.bb
index 45d212fe07..085c4aa959 100644
--- a/packages/hvsc/hvsc_5.8.bb
+++ b/packages/hvsc/hvsc_45.bb
@@ -3,12 +3,12 @@ Commodore 64 music for the masses"
 LICENSE = "PD"
 SECTION = "multimedia"
 
-SRC_URI = "http://gallium.prg.dtu.dk/HVSC/random/HVSC_${PV}-all-of-them.zip"
+SRC_URI = "http://gallium.prg.dtu.dk/HVSC/random/HVSC_${PV}-all-of-them.rar"
 S = "${WORKDIR}"
 
 do_install() {
 	install -d ${D}${datadir}/hvsc
-	unzip -d ${D}${datadir}/hvsc C64Music.zip
+	cd ${D}${datadir}/hvsc && unrar x ${S}/HVSC_${PV}-all-of-them.rar
 }
 
 PACKAGE_ARCH = "all"
diff --git a/packages/ethereal/files/.mtn2git_empty b/packages/icecc-create-env/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ethereal/files/.mtn2git_empty
+++ b/packages/icecc-create-env/.mtn2git_empty
diff --git a/packages/icecc-create-env/icecc-create-env_0.1.bb b/packages/icecc-create-env/icecc-create-env_0.1.bb
new file mode 100644
index 0000000000..89730e55d9
--- /dev/null
+++ b/packages/icecc-create-env/icecc-create-env_0.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "This is a modified version of the icecc-create-env script in order to\
+make it work with OE."
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = ""
+INHIBIT_DEFAULT_DEPS = "1"
+
+
+inherit native
+
+
+SRC_URI = "http://www.digital-opsis.com/openembedded/icecc-create-env-${PV}.tar.gz"
+
+S = "${WORKDIR}/icecc-create-env-${PV}"
+
+do_stage() {
+	install -d ${STAGING_DIR}/ice
+	install -m 0755 ${WORKDIR}/icecc-create-env ${STAGING_DIR}/ice/icecc-create-env
+}
diff --git a/packages/interbench/interbench_0.30.bb b/packages/interbench/interbench_0.30.bb
index 84bd88dbc2..77d4862f7e 100644
--- a/packages/interbench/interbench_0.30.bb
+++ b/packages/interbench/interbench_0.30.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux interactivity benchmark"
 HOMEPAGE = "http://members.optusnet.com.au/ckolivas/interbench/"
 LICENSE = "GPL"
 
-SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2"
 
 inherit autotools
 
diff --git a/packages/intercom/intercom_0.15.bb b/packages/intercom/intercom_0.15.bb
index 0f8d530718..28764c6411 100644
--- a/packages/intercom/intercom_0.15.bb
+++ b/packages/intercom/intercom_0.15.bb
@@ -4,11 +4,12 @@
 
 DESCRIPTION="A flexible audio communication utility"
 SECTION = "console/telephony"
-
-SRC_URI="http://mirror.optusnet.com.au/sourceforge/i/in/intercom/intercom-${PV}.tar.gz"
 LICENSE="GPL"
+
 PR = "r1"
 
+SRC_URI="ftp://ftp.cm.nu/pub/people/shane/intercom/intercom-${PV}.tar.gz"
+
 inherit autotools
-EXTRA_OECONF="--disable-crypto --with-cpu=${TARGET_ARCH}"
 
+EXTRA_OECONF="--disable-crypto --with-cpu=${TARGET_ARCH}"
diff --git a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff b/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff
deleted file mode 100644
index 1f2aa1307c..0000000000
--- a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.o	2004-10-10 14:14:59.022179096 +0200
-+++ Makefile.in	2004-10-10 14:15:18.952149280 +0200
-@@ -93,7 +93,7 @@
- 	
- 
- subst: subst.c
--	$(CC) $(CFLAGS) -o subst subst.c
-+	$(BUILD_CC) $(BUILD_CFLAGS) -o subst subst.c
- 
- fetchipac: fetchipac.o storagetable.o billtable.o agenttable.o batch.tab.o libipac.a batch.yy.o\
- 		     conffile.tab.o conffile.yy.o\
diff --git a/packages/ipac-ng/ipac-ng_1.30.bb b/packages/ipac-ng/ipac-ng_1.30.bb
deleted file mode 100644
index 3315c44ae7..0000000000
--- a/packages/ipac-ng/ipac-ng_1.30.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "IPAC-NG is the iptables/ipchains based IP accounting package for Linux"
-HOMEPAGE = "http://ipac-ng.sourceforge.net/"
-SRC_URI = "${SOURCEFORGE_MIRROR}/ipac-ng/ipac-ng-${PV}.tar.bz2 \
-	file://makefile-build-cc.diff;patch=1;pnum=0"
-RDEPENDS = "perl libgd-perl"
-LICENSE = "GPL"
-
-inherit autotools
-
-do_configure() {
-	oe_runconf
-}
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/ipac-ng
-	install -m 644 ${S}/doc/ipac.conf.sample ${D}${sysconfdir}/ipac-ng
-	install -m 644 ${S}/doc/rules.conf.sample ${D}${sysconfdir}/ipac-ng
-}
diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
new file mode 100644
index 0000000000..006b27b60f
--- /dev/null
+++ b/packages/iproute2/iproute2.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "kernel routing and traffic control utilities"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "flex-native bison-native"
+
+# Set DATE in the .bb file
+SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
+
+S = "${WORKDIR}/${P}-${DATE}"
+
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+
+do_install () {
+        oe_runmake DESTDIR=${D} install
+}
+
+FILES_${PN} += "/usr/lib/tc/*"
+FILES_${PN}-dbg += "/usr/lib/tc/.debug"
diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb
index d71421d1e4..ddd5ef71dd 100644
--- a/packages/iproute2/iproute2_2.6.16.bb
+++ b/packages/iproute2/iproute2_2.6.16.bb
@@ -1,20 +1,8 @@
-SECTION = "base"
-DESCRIPTION = "kernel routing and traffic control utilities"
-LICENSE = "GPL"
-DEPENDS = "flex-native bison-native"
+PR = "r1"
 
-DATE="060323"
-SRC_URI="http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \
-	file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-	file://new-flex-fix.patch;patch=1"
-PR="r1"
-S="${WORKDIR}/${P}-${DATE}"
-	
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+            file://new-flex-fix.patch;patch=1"
 
-do_install () {
-	oe_runmake DESTDIR=${D} install
-}
+require iproute2.inc
 
-FILES_${PN} += "/usr/lib/tc/*"
-FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+DATE = "060323"
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index f73c05e939..ee3ff29550 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,21 +1,8 @@
-DESCRIPTION = "kernel routing and traffic control utilities"
-SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "flex-native bison-native"
 PR = "r0"
 
-DATE = "061002"
-SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \
-           file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-           file://new-flex-fix.patch;patch=1"
-
-S = "${WORKDIR}/${P}-${DATE}"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+            file://new-flex-fix.patch;patch=1"
 
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
+require iproute2.inc
 
-do_install () {
-        oe_runmake DESTDIR=${D} install
-}
-
-FILES_${PN} += "/usr/lib/tc/*"
-FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+DATE = "061002"
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
index d09c5955f3..17a48e9b76 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb
@@ -10,7 +10,7 @@ DEPENDS = "ixp-osal"
 DEPENDS = "ixp4xx-csr"
 RDEPENDS = "ixp4xx-csr"
 
-SRC_URI = "ftp://aiedownload.intel.com/df-support/9519/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5_1.zip"
+SRC_URI = "http://downloadmirror.intel.com/df-support/10159/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5_1.zip"
 SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://2.6.15.patch;patch=1"
 SRC_URI += "file://device-name.patch;patch=1"
diff --git a/packages/jhead/jhead_2.6.0.bb b/packages/jhead/jhead_2.6.0.bb
index 9089b6f46f..126e92c909 100644
--- a/packages/jhead/jhead_2.6.0.bb
+++ b/packages/jhead/jhead_2.6.0.bb
@@ -1,9 +1,10 @@
 SECTION = "apps"
-
-S = ${WORKDIR}/jhead-2.6
 PR = "r0"
+
 SRC_URI = "http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz \
-	file://makefile.patch;patch=1"
+           file://makefile.patch;patch=1"
+
+S = "${WORKDIR}/jhead-2.6"
 
 inherit autotools 
 
diff --git a/packages/kismet/kismet-2004-04-R1/mtx-1/kismet.conf b/packages/kismet/kismet-2004-04-R1/mtx-1/kismet.conf
deleted file mode 100644
index 233aec378a..0000000000
--- a/packages/kismet/kismet-2004-04-R1/mtx-1/kismet.conf
+++ /dev/null
@@ -1,328 +0,0 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
-
-# Version of Kismet config
-version=2004.03.devel.a
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=your_user_here
-
-# Sources are defined as:
-# source=cardtype,interface,name[,initialchannel]
-# Card types and required drivers are listed in the README.
-# The initial channel is optional, if hopping is not enabled it can be used
-# to set the channel the interface listens on.
-source=hostap,wlan0,wlan0
-source=hostap,wlan1,wlan1
-# Other common source configs:
-# source=prism2,wlan0,prism2source
-# source=prism2_avs,wlan0,newprism2source
-# source=orinoco,eth0,orinocosource
-# An example source line with an initial channel:
-# source=orinoco,eth0,silver,11
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example:
-# enablesources=prismsource,ciscosource
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-channelsplit=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-# Port to serve GUI data
-tcpport=2501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-
-# Do we have a GPS?
-gps=true
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_dump    - Packets filtered at the dump level are tracked, displayed,
-#                  and written to the csv/xml/network/etc files, but not 
-#                  recorded in the packet dump
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!00:00:DE:AD:BE:EF)
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=NETSTUMBLER,5/min,2
-alert=WELLENREITER,5/min,2
-alert=LUCENTTEST,5/min,2
-alert=DEAUTHFLOOD,5/min,4
-alert=BCASTDISCON,5/min,4
-alert=CHANCHANGE,5/min,4
-alert=AIRJACKSSID,5/min,2
-alert=PROBENOJOIN,5/min,2
-alert=DISASSOCTRAFFIC,5/min,2
-alert=NULLPROBERESP,5/min,5
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=300
-
-# Do we use sound?
-# Not to be confused with GUI sound parameter, this controls wether or not the
-# server itself will play sound.  Primarily for headless or automated systems.
-sound=false
-# Path to sound player
-soundplay=/usr/bin/play
-# Optional parameters to pass to the player
-# soundopts=--volume=.3
-# New network found
-sound_new=/usr/share/kismet/wav/new_network.wav
-# Wepped new network
-# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav
-# Network traffic sound
-sound_traffic=/usr/share/kismet/wav/traffic.wav
-# Network junk traffic found
-sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav
-# GPS lock aquired sound
-# sound_gpslock=/usr/share/kismet/wav/foo.wav
-# GPS lock lost sound
-# sound_gpslost=/usr/share/kismet/wav/bar.wav
-# Alert sound
-sound_alert=/usr/share/kismet/wav/alert.wav
-
-# Does the server have speech? (Again, not to be confused with the GUI's speech)
-speech=false
-# Server's path to Festival
-festival=/usr/bin/festival
-# How do we speak?  Valid options:
-# speech    Normal speech
-# nato      NATO spellings (alpha, bravo, charlie)
-# spell     Spell the letters out (aye, bee, sea)
-speech_type=nato
-# speech_encrypted and speech_unencrypted - Speech templates
-# Similar to the logtemplate option, this lets you customize the speech output.
-# speech_encrypted is used for an encrypted network spoken string
-# speech_unencrypted is used for an unencrypted network spoken string
-#
-# %b is replaced by the BSSID (MAC) of the network
-# %s is replaced by the SSID (name) of the network
-# %c is replaced by the CHANNEL of the network
-# %r is replaced by the MAX RATE of the network
-speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted.
-speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open.
-
-# Where do we get our manufacturer fingerprints from?  Assumed to be in the
-# default config directory if an absolute path is not given.
-ap_manuf=ap_manuf
-client_manuf=client_manuf
-
-# Use metric measurements in the output?
-metric=false
-
-# Do we write waypoints for gpsdrive to load?  Note:  This is NOT related to
-# recent versions of GPSDrive's native support of Kismet.
-waypoints=false
-# GPSMap waypoint file.  This WILL be truncated.
-waypointdata=%h/.gpsdrive/way_kismet.txt
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated
-# dump    - raw packet dump
-# network - plaintext detected networks
-# csv     - plaintext detected networks in CSV format
-# xml     - XML formatted network and cisco log
-# weak    - weak packets (in airsnort format)
-# cisco   - cisco equipment CDP broadcasts
-# gps     - gps coordinates
-logtypes=dump,network,csv,xml,weak,cisco,gps
-
-# Do we track probe responses and merge probe networks into their owners?
-# This isn't always desireable, depending on the type of monitoring you're
-# trying to do.
-trackprobenets=true
-
-# Do we log "noise" packets that we can't decipher?  I tend to not, since 
-# they don't have anything interesting at all in them.
-noiselog=false
-
-# Do we log corrupt packets?  Corrupt packets have enough header information
-# to see what they are, but someting is wrong with them that prevents us from
-# completely dissecting them.  Logging these is usually not a bad idea.
-corruptlog=true
-
-# Do we log beacon packets or do we filter them out of the dumpfile
-beaconlog=true
-
-# Do we log PHY layer packets or do we filter them out of the dumpfile
-phylog=true
-
-# Do we mangle packets if we can decrypt them or if they're fuzzy-detected
-mangledatalog=true
-
-# Do we do "fuzzy" crypt detection?  (byte-based detection instead of 802.11
-# frame headers)
-# valid option: Comma seperated list of card types to perform fuzzy detection 
-#  on, or 'all'
-fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext
-
-# What type of dump do we generate? 
-# valid option: "wiretap" 
-dumptype=wiretap
-# Do we limit the size of dump logs?  Sometimes ethereal can't handle big ones.
-# 0 = No limit
-# Anything else = Max number of packets to log to a single file before closing
-# and opening a new one.
-dumplimit=0
-
-# Do we write data packets to a FIFO for an external data-IDS (such as Snort)?
-# See the docs before enabling this.
-#fifo=/tmp/kismet_dump
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %n is replaced by the logging instance name
-# %d is replaced by the current date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting log time
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (dump, status, crypt, etc)
-# %h is replaced by the home directory
-# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand
-# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and 
-# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated.
-# %h/netlots/%n-%d-%i.dump could expand to
-# /home/foo/netlogs/Pok-Dec-20-01-2.dump
-#
-# Other possibilities:  Sorting by directory
-# logtemplate=%l/%n-%d-%i
-# Would expand to, for example,
-# dump/Pok-Dec-20-01-1
-# crypt/Pok-Dec-20-01-1
-# and so on.  The "dump", "crypt", etc, dirs must exist before kismet is run
-# in this case.
-logtemplate=/tmp/%n-%d-%i.%l
-
-# Where do we store the pid file of the server?
-piddir=/var/run/
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
-# cloaked SSID file.  You shouldn't ever need to change this.
-ssidmap=ssid_map
-
-# Group map file.  You shouldn't ever need to change this.
-groupmap=group_map
-
-# IP range map file.  You shouldn't ever need to change this.
-ipmap=ip_map
-
diff --git a/packages/kismet/kismet-2004-04-R1/mtx-2/kismet.conf b/packages/kismet/kismet-2004-04-R1/mtx-2/kismet.conf
deleted file mode 100644
index 233aec378a..0000000000
--- a/packages/kismet/kismet-2004-04-R1/mtx-2/kismet.conf
+++ /dev/null
@@ -1,328 +0,0 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
-
-# Version of Kismet config
-version=2004.03.devel.a
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=your_user_here
-
-# Sources are defined as:
-# source=cardtype,interface,name[,initialchannel]
-# Card types and required drivers are listed in the README.
-# The initial channel is optional, if hopping is not enabled it can be used
-# to set the channel the interface listens on.
-source=hostap,wlan0,wlan0
-source=hostap,wlan1,wlan1
-# Other common source configs:
-# source=prism2,wlan0,prism2source
-# source=prism2_avs,wlan0,newprism2source
-# source=orinoco,eth0,orinocosource
-# An example source line with an initial channel:
-# source=orinoco,eth0,silver,11
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example:
-# enablesources=prismsource,ciscosource
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-channelsplit=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-# Port to serve GUI data
-tcpport=2501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-
-# Do we have a GPS?
-gps=true
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_dump    - Packets filtered at the dump level are tracked, displayed,
-#                  and written to the csv/xml/network/etc files, but not 
-#                  recorded in the packet dump
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!00:00:DE:AD:BE:EF)
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=NETSTUMBLER,5/min,2
-alert=WELLENREITER,5/min,2
-alert=LUCENTTEST,5/min,2
-alert=DEAUTHFLOOD,5/min,4
-alert=BCASTDISCON,5/min,4
-alert=CHANCHANGE,5/min,4
-alert=AIRJACKSSID,5/min,2
-alert=PROBENOJOIN,5/min,2
-alert=DISASSOCTRAFFIC,5/min,2
-alert=NULLPROBERESP,5/min,5
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=300
-
-# Do we use sound?
-# Not to be confused with GUI sound parameter, this controls wether or not the
-# server itself will play sound.  Primarily for headless or automated systems.
-sound=false
-# Path to sound player
-soundplay=/usr/bin/play
-# Optional parameters to pass to the player
-# soundopts=--volume=.3
-# New network found
-sound_new=/usr/share/kismet/wav/new_network.wav
-# Wepped new network
-# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav
-# Network traffic sound
-sound_traffic=/usr/share/kismet/wav/traffic.wav
-# Network junk traffic found
-sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav
-# GPS lock aquired sound
-# sound_gpslock=/usr/share/kismet/wav/foo.wav
-# GPS lock lost sound
-# sound_gpslost=/usr/share/kismet/wav/bar.wav
-# Alert sound
-sound_alert=/usr/share/kismet/wav/alert.wav
-
-# Does the server have speech? (Again, not to be confused with the GUI's speech)
-speech=false
-# Server's path to Festival
-festival=/usr/bin/festival
-# How do we speak?  Valid options:
-# speech    Normal speech
-# nato      NATO spellings (alpha, bravo, charlie)
-# spell     Spell the letters out (aye, bee, sea)
-speech_type=nato
-# speech_encrypted and speech_unencrypted - Speech templates
-# Similar to the logtemplate option, this lets you customize the speech output.
-# speech_encrypted is used for an encrypted network spoken string
-# speech_unencrypted is used for an unencrypted network spoken string
-#
-# %b is replaced by the BSSID (MAC) of the network
-# %s is replaced by the SSID (name) of the network
-# %c is replaced by the CHANNEL of the network
-# %r is replaced by the MAX RATE of the network
-speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted.
-speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open.
-
-# Where do we get our manufacturer fingerprints from?  Assumed to be in the
-# default config directory if an absolute path is not given.
-ap_manuf=ap_manuf
-client_manuf=client_manuf
-
-# Use metric measurements in the output?
-metric=false
-
-# Do we write waypoints for gpsdrive to load?  Note:  This is NOT related to
-# recent versions of GPSDrive's native support of Kismet.
-waypoints=false
-# GPSMap waypoint file.  This WILL be truncated.
-waypointdata=%h/.gpsdrive/way_kismet.txt
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated
-# dump    - raw packet dump
-# network - plaintext detected networks
-# csv     - plaintext detected networks in CSV format
-# xml     - XML formatted network and cisco log
-# weak    - weak packets (in airsnort format)
-# cisco   - cisco equipment CDP broadcasts
-# gps     - gps coordinates
-logtypes=dump,network,csv,xml,weak,cisco,gps
-
-# Do we track probe responses and merge probe networks into their owners?
-# This isn't always desireable, depending on the type of monitoring you're
-# trying to do.
-trackprobenets=true
-
-# Do we log "noise" packets that we can't decipher?  I tend to not, since 
-# they don't have anything interesting at all in them.
-noiselog=false
-
-# Do we log corrupt packets?  Corrupt packets have enough header information
-# to see what they are, but someting is wrong with them that prevents us from
-# completely dissecting them.  Logging these is usually not a bad idea.
-corruptlog=true
-
-# Do we log beacon packets or do we filter them out of the dumpfile
-beaconlog=true
-
-# Do we log PHY layer packets or do we filter them out of the dumpfile
-phylog=true
-
-# Do we mangle packets if we can decrypt them or if they're fuzzy-detected
-mangledatalog=true
-
-# Do we do "fuzzy" crypt detection?  (byte-based detection instead of 802.11
-# frame headers)
-# valid option: Comma seperated list of card types to perform fuzzy detection 
-#  on, or 'all'
-fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext
-
-# What type of dump do we generate? 
-# valid option: "wiretap" 
-dumptype=wiretap
-# Do we limit the size of dump logs?  Sometimes ethereal can't handle big ones.
-# 0 = No limit
-# Anything else = Max number of packets to log to a single file before closing
-# and opening a new one.
-dumplimit=0
-
-# Do we write data packets to a FIFO for an external data-IDS (such as Snort)?
-# See the docs before enabling this.
-#fifo=/tmp/kismet_dump
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %n is replaced by the logging instance name
-# %d is replaced by the current date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting log time
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (dump, status, crypt, etc)
-# %h is replaced by the home directory
-# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand
-# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and 
-# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated.
-# %h/netlots/%n-%d-%i.dump could expand to
-# /home/foo/netlogs/Pok-Dec-20-01-2.dump
-#
-# Other possibilities:  Sorting by directory
-# logtemplate=%l/%n-%d-%i
-# Would expand to, for example,
-# dump/Pok-Dec-20-01-1
-# crypt/Pok-Dec-20-01-1
-# and so on.  The "dump", "crypt", etc, dirs must exist before kismet is run
-# in this case.
-logtemplate=/tmp/%n-%d-%i.%l
-
-# Where do we store the pid file of the server?
-piddir=/var/run/
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
-# cloaked SSID file.  You shouldn't ever need to change this.
-ssidmap=ssid_map
-
-# Group map file.  You shouldn't ever need to change this.
-groupmap=group_map
-
-# IP range map file.  You shouldn't ever need to change this.
-ipmap=ip_map
-
diff --git a/packages/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff b/packages/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff
deleted file mode 100644
index 6b2b5f74a6..0000000000
--- a/packages/kismet/kismet-2004-04-R1/no-lib-modules-uname-include.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.o	2004-10-18 13:37:48.208863080 +0200
-+++ configure	2004-10-18 13:39:16.298471424 +0200
-@@ -5805,9 +5805,9 @@
- if test "$wireless" = "yes"; then
-     # If we're compiling under linux and we need the wireless extentions,
-     # then we should try to look in the current kernel module build dir, too.
--    if test "$linux" = "yes"; then
--        CPPFLAGS="$CPPFLAGS -I/lib/modules/\`uname -r\`/build/include/"
--    fi
-+    #if test "$linux" = "yes"; then
-+    #    CPPFLAGS="$CPPFLAGS -I/lib/modules/\`uname -r\`/build/include/"
-+    #fi
- 
-     echo "$as_me:$LINENO: checking that linux/wireless.h is what we expect" >&5
- echo $ECHO_N "checking that linux/wireless.h is what we expect... $ECHO_C" >&6
diff --git a/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch b/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch
deleted file mode 100644
index 1b72cf8ce7..0000000000
--- a/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kismet-2004-04-R1/packet.h.orig	2005-02-04 09:12:36.000000000 +0000
-+++ kismet-2004-04-R1/packet.h	2005-02-04 09:13:14.000000000 +0000
-@@ -550,7 +550,7 @@
-     // This isn't quite like STL iterators, because I'm too damned lazy to deal with all
-     // the nasty STL hoop-jumping.  This does provide a somewhat-stl-ish interface to
-     // iterating through the singleton and masked maps
--    friend class iterator {
-+    class iterator {
-         friend class macmap;
- 
-     public:
-@@ -643,6 +643,7 @@
-         int vector_itr;
-         macmap<T> *owner;
-     };
-+    friend class iterator;
- 
-     iterator begin() {
-         iterator ret(this);
diff --git a/packages/kismet/kismet-2005-01-R1/mtx-1/.mtn2git_empty b/packages/kismet/kismet-2005-01-R1/mtx-1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/kismet/kismet-2005-01-R1/mtx-1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/kismet/kismet-2005-01-R1/mtx-1/kismet.conf b/packages/kismet/kismet-2005-01-R1/mtx-1/kismet.conf
deleted file mode 100644
index 233aec378a..0000000000
--- a/packages/kismet/kismet-2005-01-R1/mtx-1/kismet.conf
+++ /dev/null
@@ -1,328 +0,0 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
-
-# Version of Kismet config
-version=2004.03.devel.a
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=your_user_here
-
-# Sources are defined as:
-# source=cardtype,interface,name[,initialchannel]
-# Card types and required drivers are listed in the README.
-# The initial channel is optional, if hopping is not enabled it can be used
-# to set the channel the interface listens on.
-source=hostap,wlan0,wlan0
-source=hostap,wlan1,wlan1
-# Other common source configs:
-# source=prism2,wlan0,prism2source
-# source=prism2_avs,wlan0,newprism2source
-# source=orinoco,eth0,orinocosource
-# An example source line with an initial channel:
-# source=orinoco,eth0,silver,11
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example:
-# enablesources=prismsource,ciscosource
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-channelsplit=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-# Port to serve GUI data
-tcpport=2501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-
-# Do we have a GPS?
-gps=true
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_dump    - Packets filtered at the dump level are tracked, displayed,
-#                  and written to the csv/xml/network/etc files, but not 
-#                  recorded in the packet dump
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!00:00:DE:AD:BE:EF)
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=NETSTUMBLER,5/min,2
-alert=WELLENREITER,5/min,2
-alert=LUCENTTEST,5/min,2
-alert=DEAUTHFLOOD,5/min,4
-alert=BCASTDISCON,5/min,4
-alert=CHANCHANGE,5/min,4
-alert=AIRJACKSSID,5/min,2
-alert=PROBENOJOIN,5/min,2
-alert=DISASSOCTRAFFIC,5/min,2
-alert=NULLPROBERESP,5/min,5
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=300
-
-# Do we use sound?
-# Not to be confused with GUI sound parameter, this controls wether or not the
-# server itself will play sound.  Primarily for headless or automated systems.
-sound=false
-# Path to sound player
-soundplay=/usr/bin/play
-# Optional parameters to pass to the player
-# soundopts=--volume=.3
-# New network found
-sound_new=/usr/share/kismet/wav/new_network.wav
-# Wepped new network
-# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav
-# Network traffic sound
-sound_traffic=/usr/share/kismet/wav/traffic.wav
-# Network junk traffic found
-sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav
-# GPS lock aquired sound
-# sound_gpslock=/usr/share/kismet/wav/foo.wav
-# GPS lock lost sound
-# sound_gpslost=/usr/share/kismet/wav/bar.wav
-# Alert sound
-sound_alert=/usr/share/kismet/wav/alert.wav
-
-# Does the server have speech? (Again, not to be confused with the GUI's speech)
-speech=false
-# Server's path to Festival
-festival=/usr/bin/festival
-# How do we speak?  Valid options:
-# speech    Normal speech
-# nato      NATO spellings (alpha, bravo, charlie)
-# spell     Spell the letters out (aye, bee, sea)
-speech_type=nato
-# speech_encrypted and speech_unencrypted - Speech templates
-# Similar to the logtemplate option, this lets you customize the speech output.
-# speech_encrypted is used for an encrypted network spoken string
-# speech_unencrypted is used for an unencrypted network spoken string
-#
-# %b is replaced by the BSSID (MAC) of the network
-# %s is replaced by the SSID (name) of the network
-# %c is replaced by the CHANNEL of the network
-# %r is replaced by the MAX RATE of the network
-speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted.
-speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open.
-
-# Where do we get our manufacturer fingerprints from?  Assumed to be in the
-# default config directory if an absolute path is not given.
-ap_manuf=ap_manuf
-client_manuf=client_manuf
-
-# Use metric measurements in the output?
-metric=false
-
-# Do we write waypoints for gpsdrive to load?  Note:  This is NOT related to
-# recent versions of GPSDrive's native support of Kismet.
-waypoints=false
-# GPSMap waypoint file.  This WILL be truncated.
-waypointdata=%h/.gpsdrive/way_kismet.txt
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated
-# dump    - raw packet dump
-# network - plaintext detected networks
-# csv     - plaintext detected networks in CSV format
-# xml     - XML formatted network and cisco log
-# weak    - weak packets (in airsnort format)
-# cisco   - cisco equipment CDP broadcasts
-# gps     - gps coordinates
-logtypes=dump,network,csv,xml,weak,cisco,gps
-
-# Do we track probe responses and merge probe networks into their owners?
-# This isn't always desireable, depending on the type of monitoring you're
-# trying to do.
-trackprobenets=true
-
-# Do we log "noise" packets that we can't decipher?  I tend to not, since 
-# they don't have anything interesting at all in them.
-noiselog=false
-
-# Do we log corrupt packets?  Corrupt packets have enough header information
-# to see what they are, but someting is wrong with them that prevents us from
-# completely dissecting them.  Logging these is usually not a bad idea.
-corruptlog=true
-
-# Do we log beacon packets or do we filter them out of the dumpfile
-beaconlog=true
-
-# Do we log PHY layer packets or do we filter them out of the dumpfile
-phylog=true
-
-# Do we mangle packets if we can decrypt them or if they're fuzzy-detected
-mangledatalog=true
-
-# Do we do "fuzzy" crypt detection?  (byte-based detection instead of 802.11
-# frame headers)
-# valid option: Comma seperated list of card types to perform fuzzy detection 
-#  on, or 'all'
-fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext
-
-# What type of dump do we generate? 
-# valid option: "wiretap" 
-dumptype=wiretap
-# Do we limit the size of dump logs?  Sometimes ethereal can't handle big ones.
-# 0 = No limit
-# Anything else = Max number of packets to log to a single file before closing
-# and opening a new one.
-dumplimit=0
-
-# Do we write data packets to a FIFO for an external data-IDS (such as Snort)?
-# See the docs before enabling this.
-#fifo=/tmp/kismet_dump
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %n is replaced by the logging instance name
-# %d is replaced by the current date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting log time
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (dump, status, crypt, etc)
-# %h is replaced by the home directory
-# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand
-# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and 
-# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated.
-# %h/netlots/%n-%d-%i.dump could expand to
-# /home/foo/netlogs/Pok-Dec-20-01-2.dump
-#
-# Other possibilities:  Sorting by directory
-# logtemplate=%l/%n-%d-%i
-# Would expand to, for example,
-# dump/Pok-Dec-20-01-1
-# crypt/Pok-Dec-20-01-1
-# and so on.  The "dump", "crypt", etc, dirs must exist before kismet is run
-# in this case.
-logtemplate=/tmp/%n-%d-%i.%l
-
-# Where do we store the pid file of the server?
-piddir=/var/run/
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
-# cloaked SSID file.  You shouldn't ever need to change this.
-ssidmap=ssid_map
-
-# Group map file.  You shouldn't ever need to change this.
-groupmap=group_map
-
-# IP range map file.  You shouldn't ever need to change this.
-ipmap=ip_map
-
diff --git a/packages/kismet/kismet-2005-01-R1/mtx-2/.mtn2git_empty b/packages/kismet/kismet-2005-01-R1/mtx-2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/kismet/kismet-2005-01-R1/mtx-2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/kismet/kismet-2005-01-R1/mtx-2/kismet.conf b/packages/kismet/kismet-2005-01-R1/mtx-2/kismet.conf
deleted file mode 100644
index 233aec378a..0000000000
--- a/packages/kismet/kismet-2005-01-R1/mtx-2/kismet.conf
+++ /dev/null
@@ -1,328 +0,0 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
-
-# Version of Kismet config
-version=2004.03.devel.a
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=your_user_here
-
-# Sources are defined as:
-# source=cardtype,interface,name[,initialchannel]
-# Card types and required drivers are listed in the README.
-# The initial channel is optional, if hopping is not enabled it can be used
-# to set the channel the interface listens on.
-source=hostap,wlan0,wlan0
-source=hostap,wlan1,wlan1
-# Other common source configs:
-# source=prism2,wlan0,prism2source
-# source=prism2_avs,wlan0,newprism2source
-# source=orinoco,eth0,orinocosource
-# An example source line with an initial channel:
-# source=orinoco,eth0,silver,11
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example:
-# enablesources=prismsource,ciscosource
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-channelsplit=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-# Port to serve GUI data
-tcpport=2501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-
-# Do we have a GPS?
-gps=true
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_dump    - Packets filtered at the dump level are tracked, displayed,
-#                  and written to the csv/xml/network/etc files, but not 
-#                  recorded in the packet dump
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!00:00:DE:AD:BE:EF)
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=NETSTUMBLER,5/min,2
-alert=WELLENREITER,5/min,2
-alert=LUCENTTEST,5/min,2
-alert=DEAUTHFLOOD,5/min,4
-alert=BCASTDISCON,5/min,4
-alert=CHANCHANGE,5/min,4
-alert=AIRJACKSSID,5/min,2
-alert=PROBENOJOIN,5/min,2
-alert=DISASSOCTRAFFIC,5/min,2
-alert=NULLPROBERESP,5/min,5
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=300
-
-# Do we use sound?
-# Not to be confused with GUI sound parameter, this controls wether or not the
-# server itself will play sound.  Primarily for headless or automated systems.
-sound=false
-# Path to sound player
-soundplay=/usr/bin/play
-# Optional parameters to pass to the player
-# soundopts=--volume=.3
-# New network found
-sound_new=/usr/share/kismet/wav/new_network.wav
-# Wepped new network
-# sound_new_wep=/usr/com/kismet/wav/new_wep_network.wav
-# Network traffic sound
-sound_traffic=/usr/share/kismet/wav/traffic.wav
-# Network junk traffic found
-sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav
-# GPS lock aquired sound
-# sound_gpslock=/usr/share/kismet/wav/foo.wav
-# GPS lock lost sound
-# sound_gpslost=/usr/share/kismet/wav/bar.wav
-# Alert sound
-sound_alert=/usr/share/kismet/wav/alert.wav
-
-# Does the server have speech? (Again, not to be confused with the GUI's speech)
-speech=false
-# Server's path to Festival
-festival=/usr/bin/festival
-# How do we speak?  Valid options:
-# speech    Normal speech
-# nato      NATO spellings (alpha, bravo, charlie)
-# spell     Spell the letters out (aye, bee, sea)
-speech_type=nato
-# speech_encrypted and speech_unencrypted - Speech templates
-# Similar to the logtemplate option, this lets you customize the speech output.
-# speech_encrypted is used for an encrypted network spoken string
-# speech_unencrypted is used for an unencrypted network spoken string
-#
-# %b is replaced by the BSSID (MAC) of the network
-# %s is replaced by the SSID (name) of the network
-# %c is replaced by the CHANNEL of the network
-# %r is replaced by the MAX RATE of the network
-speech_encrypted=New network detected, s.s.i.d. %s, channel %c, network encrypted.
-speech_unencrypted=New network detected, s.s.i.d. %s, channel %c, network open.
-
-# Where do we get our manufacturer fingerprints from?  Assumed to be in the
-# default config directory if an absolute path is not given.
-ap_manuf=ap_manuf
-client_manuf=client_manuf
-
-# Use metric measurements in the output?
-metric=false
-
-# Do we write waypoints for gpsdrive to load?  Note:  This is NOT related to
-# recent versions of GPSDrive's native support of Kismet.
-waypoints=false
-# GPSMap waypoint file.  This WILL be truncated.
-waypointdata=%h/.gpsdrive/way_kismet.txt
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated
-# dump    - raw packet dump
-# network - plaintext detected networks
-# csv     - plaintext detected networks in CSV format
-# xml     - XML formatted network and cisco log
-# weak    - weak packets (in airsnort format)
-# cisco   - cisco equipment CDP broadcasts
-# gps     - gps coordinates
-logtypes=dump,network,csv,xml,weak,cisco,gps
-
-# Do we track probe responses and merge probe networks into their owners?
-# This isn't always desireable, depending on the type of monitoring you're
-# trying to do.
-trackprobenets=true
-
-# Do we log "noise" packets that we can't decipher?  I tend to not, since 
-# they don't have anything interesting at all in them.
-noiselog=false
-
-# Do we log corrupt packets?  Corrupt packets have enough header information
-# to see what they are, but someting is wrong with them that prevents us from
-# completely dissecting them.  Logging these is usually not a bad idea.
-corruptlog=true
-
-# Do we log beacon packets or do we filter them out of the dumpfile
-beaconlog=true
-
-# Do we log PHY layer packets or do we filter them out of the dumpfile
-phylog=true
-
-# Do we mangle packets if we can decrypt them or if they're fuzzy-detected
-mangledatalog=true
-
-# Do we do "fuzzy" crypt detection?  (byte-based detection instead of 802.11
-# frame headers)
-# valid option: Comma seperated list of card types to perform fuzzy detection 
-#  on, or 'all'
-fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext
-
-# What type of dump do we generate? 
-# valid option: "wiretap" 
-dumptype=wiretap
-# Do we limit the size of dump logs?  Sometimes ethereal can't handle big ones.
-# 0 = No limit
-# Anything else = Max number of packets to log to a single file before closing
-# and opening a new one.
-dumplimit=0
-
-# Do we write data packets to a FIFO for an external data-IDS (such as Snort)?
-# See the docs before enabling this.
-#fifo=/tmp/kismet_dump
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %n is replaced by the logging instance name
-# %d is replaced by the current date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting log time
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (dump, status, crypt, etc)
-# %h is replaced by the home directory
-# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand
-# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and 
-# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated.
-# %h/netlots/%n-%d-%i.dump could expand to
-# /home/foo/netlogs/Pok-Dec-20-01-2.dump
-#
-# Other possibilities:  Sorting by directory
-# logtemplate=%l/%n-%d-%i
-# Would expand to, for example,
-# dump/Pok-Dec-20-01-1
-# crypt/Pok-Dec-20-01-1
-# and so on.  The "dump", "crypt", etc, dirs must exist before kismet is run
-# in this case.
-logtemplate=/tmp/%n-%d-%i.%l
-
-# Where do we store the pid file of the server?
-piddir=/var/run/
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
-# cloaked SSID file.  You shouldn't ever need to change this.
-ssidmap=ssid_map
-
-# Group map file.  You shouldn't ever need to change this.
-groupmap=group_map
-
-# IP range map file.  You shouldn't ever need to change this.
-ipmap=ip_map
-
diff --git a/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff b/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff
deleted file mode 100644
index 9be6fd3bd0..0000000000
--- a/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	2005-02-21 12:12:23.061566024 +0000
-+++ configure	2005-02-21 12:12:34.560817872 +0000
-@@ -6225,9 +6225,9 @@
- if test "$wireless" = "yes"; then
-     # If we're compiling under linux and we need the wireless extentions,
-     # then we should try to look in the current kernel module build dir, too.
--    if test "$linux" = "yes"; then
--        CPPFLAGS="$CPPFLAGS -I/lib/modules/$(uname -r)/build/include/"
--    fi
-+    #if test "$linux" = "yes"; then
-+    #    CPPFLAGS="$CPPFLAGS -I/lib/modules/$(uname -r)/build/include/"
-+    #fi
- 
-     echo "$as_me:$LINENO: checking that linux/wireless.h is what we expect" >&5
- echo $ECHO_N "checking that linux/wireless.h is what we expect... $ECHO_C" >&6
diff --git a/packages/kismet/kismet_2004-04-R1.bb b/packages/kismet/kismet_2004-04-R1.bb
deleted file mode 100644
index 30e31075fd..0000000000
--- a/packages/kismet/kismet_2004-04-R1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-2004-04-R1.tar.gz \
-	file://no-strip.diff;patch=1;pnum=0 \
-	file://no-chmod.diff;patch=1;pnum=0 \
-	file://no-lib-modules-uname-include.diff;patch=1;pnum=0 \
-	file://packet_friend_fix.patch;patch=1 \
-	file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
-	
-SRC_URI_append_mtx-1 = " file://kismet.conf"
-SRC_URI_append_mtx-2 = " file://kismet.conf"
-
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid"
-
-inherit autotools
-
-do_configure() {
-	unset CFLAGS CPPFLAGS
-	oe_runconf
-}
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "kismet-sounds"
-FILES_kismet-sounds = "${datadir}/kismet/wav"
-
-CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/kismet/kismet_2005-01-R1.bb b/packages/kismet/kismet_2005-01-R1.bb
deleted file mode 100644
index 792cc38384..0000000000
--- a/packages/kismet/kismet_2005-01-R1.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-HOMEPAGE = "http://www.kismetwireless.net/"
-LICENSE = "GPLv2"
-DEPENDS = "expat gmp"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-01-R1.tar.gz \
-	file://no-strip.diff;patch=1;pnum=0 \
-	file://no-chmod.diff;patch=1;pnum=0 \
-	file://no-lib-modules-uname-include.diff;patch=1;pnum=0 \
-	file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
-	
-
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid"
-
-inherit autotools
-
-do_configure() {
-	oe_runconf
-}
-
-
-do_install_append() {
-	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
-	fi
-}
-
-PACKAGES =+ "kismet-sounds"
-FILES_kismet-sounds = "/usr/share/kismet/wav"
-
-CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/liblockfile/liblockfile-1.05/.mtn2git_empty b/packages/liblockfile/liblockfile-1.05/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/liblockfile/liblockfile-1.05/.mtn2git_empty
+++ /dev/null
diff --git a/packages/liblockfile/liblockfile-1.05/configure.patch b/packages/liblockfile/liblockfile-1.05/configure.patch
deleted file mode 100644
index ea13e11d25..0000000000
--- a/packages/liblockfile/liblockfile-1.05/configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- liblockfile-1.05/./configure.in~configure
-+++ liblockfile-1.05/./configure.in
-@@ -1,4 +1,5 @@
--AC_INIT(lockfile.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([lockfile.c])
- AC_CONFIG_HEADER(autoconf.h)
- AC_REVISION($Revision: 1.0 $)dnl
- 
-@@ -111,7 +112,8 @@
- AC_SUBST(INSTALL_TARGETS)
- AC_SUBST(nfslockdir)
- 
--AC_OUTPUT(\
-+AC_CONFIG_FILES([\
- 	./Makefile \
- 	./maillock.h \
--)
-+])
-+AC_OUTPUT
diff --git a/packages/liblockfile/liblockfile-1.05/install.patch b/packages/liblockfile/liblockfile-1.05/install.patch
deleted file mode 100644
index a9319ff1e3..0000000000
--- a/packages/liblockfile/liblockfile-1.05/install.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- liblockfile-1.05/Makefile.in~install
-+++ liblockfile-1.05/Makefile.in
-@@ -20,6 +20,7 @@
- includedir	= @includedir@
- 
- MAILGROUP	= @MAILGROUP@
-+INSTGRP		= $(if $(MAILGROUP),-g $(MAILGROUP))
- 
- all:		@TARGETS@
- install:	@INSTALL_TARGETS@
-@@ -50,25 +51,27 @@
- 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
- 
- install_static:	static install_common
-+		install -d $(ROOT)$(libdir)
- 		install -m 644 liblockfile.a $(ROOT)$(libdir)
- 
- install_shared:	shared install_common
-+		install -d $(ROOT)$(libdir)
- 		install -m 755 liblockfile.so \
- 			$(ROOT)$(libdir)/liblockfile.so.$(VER)
- 		ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
- 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
- 
- install_common:
-+		install -d $(ROOT)$(includedir)
- 		install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
--		if [ "$(MAILGROUP)" != "" ]; then\
--		  install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
--		else \
--		  install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
--		fi
-+		install -d $(ROOT)$(bindir)
-+		install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir)
-+		install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3
- 		install -m 644 *.1 $(ROOT)$(mandir)/man1
- 		install -m 644 *.3 $(ROOT)$(mandir)/man3
- 
- install_nfslib:	nfslib
-+		install -d $(ROOT)$(nfslockdir)
- 		install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
- 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
- 
diff --git a/packages/liblockfile/liblockfile-1.05/ldflags.patch b/packages/liblockfile/liblockfile-1.05/ldflags.patch
deleted file mode 100644
index eb1d1478b8..0000000000
--- a/packages/liblockfile/liblockfile-1.05/ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- liblockfile-1.05/Makefile.in~ldflags
-+++ liblockfile-1.05/Makefile.in
-@@ -34,11 +34,11 @@
- 
- liblockfile.so: liblockfile.a
- 		$(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
--			-o liblockfile.so lockfile.o -lc
-+			-o liblockfile.so lockfile.o $(LDFLAGS) -lc
- 
- nfslock.so.$(VER):	nfslock.o
- 		$(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
--			-o nfslock.so.$(NVER) nfslock.o
-+			-o nfslock.so.$(NVER) nfslock.o $(LDFLAGS)
- 
- dotlockfile:	dotlockfile.o xlockfile.o
- 		$(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
diff --git a/packages/liblockfile/liblockfile_1.05.bb b/packages/liblockfile/liblockfile_1.05.bb
deleted file mode 100644
index c4d72fcc23..0000000000
--- a/packages/liblockfile/liblockfile_1.05.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "libs"
-DESCRIPTION = "File locking library."
-LICENSE = "LGPL"
-SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_${PV}.tar.gz \
-	   file://install.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-	   file://ldflags.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-shared --enable-static"
-
-do_stage () {
-	install -m 644 ${S}/lockfile.h ${S}/maillock.h ${STAGING_INCDIR}/
-	oe_libinstall -a -so liblockfile ${STAGING_LIBDIR}
-#	oe_libinstall -so nfslock ${STAGING_LIBDIR}
-}
-
-do_install () {
-	oe_runmake 'ROOT=${D}' INSTGRP='' install
-}
diff --git a/packages/libmatchbox/libmatchbox_1.2.bb b/packages/libmatchbox/libmatchbox_1.2.bb
index e7e84bb913..467a3b1d74 100644
--- a/packages/libmatchbox/libmatchbox_1.2.bb
+++ b/packages/libmatchbox/libmatchbox_1.2.bb
@@ -2,5 +2,5 @@ require libmatchbox.inc
 
 PR = "r2"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
diff --git a/packages/libmatchbox/libmatchbox_1.3.bb b/packages/libmatchbox/libmatchbox_1.3.bb
index 45a35b6190..7213e71542 100644
--- a/packages/libmatchbox/libmatchbox_1.3.bb
+++ b/packages/libmatchbox/libmatchbox_1.3.bb
@@ -2,5 +2,5 @@ require libmatchbox.inc
 
 PR = "r1"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
diff --git a/packages/libmatchbox/libmatchbox_1.4.bb b/packages/libmatchbox/libmatchbox_1.4.bb
index 45a35b6190..7213e71542 100644
--- a/packages/libmatchbox/libmatchbox_1.4.bb
+++ b/packages/libmatchbox/libmatchbox_1.4.bb
@@ -2,5 +2,5 @@ require libmatchbox.inc
 
 PR = "r1"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
diff --git a/packages/libsamplerate/libsamplerate0_0.1.2.bb b/packages/libsamplerate/libsamplerate0_0.1.2.bb
index b961d30b36..78a7f403d4 100644
--- a/packages/libsamplerate/libsamplerate0_0.1.2.bb
+++ b/packages/libsamplerate/libsamplerate0_0.1.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "An audio Sample Rate Conversion library"
 SECTION = "libs"
 LICENSE = "GPL libsamplerate"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
 S = "${WORKDIR}/libsamplerate-${PV}"
@@ -12,6 +12,3 @@ do_stage() {
 	oe_libinstall -a -so -C src libsamplerate ${STAGING_LIBDIR}
 	install -m 0644 ${S}/src/samplerate.h ${STAGING_INCDIR}/
 }
-
-PACKAGES = "${PN}"
-FILES_${PN} = "${libdir}/libsamplerate.so*"
diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb
index 9f9e8bbac2..aabcb926ff 100644
--- a/packages/libxml/libxml2_2.6.26.bb
+++ b/packages/libxml/libxml2_2.6.26.bb
@@ -9,6 +9,8 @@ inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
 
+export LDFLAGS += "-ldl"
+
 do_stage() {
 	autotools_stage_all
 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
diff --git a/packages/links/links-x11_2.1pre23.bb b/packages/links/links-x11_2.0+2.1pre26.bb
index ba9e531ca2..c026ca7e02 100644
--- a/packages/links/links-x11_2.1pre23.bb
+++ b/packages/links/links-x11_2.0+2.1pre26.bb
@@ -1,20 +1,10 @@
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-HOMEPAGE = "http://links.twibright.com/"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
+require links.inc
+
+DEPENDS += "virtual/libx11"
 RCONFLICTS = "links"
 PR = "r0"
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1 \
-	   file://links2.desktop \
-           http://www.xora.org.uk/oe/links2.png"
-S = "${WORKDIR}/links-${PV}"
-
-inherit autotools
+SRC_URI += " file://links2.desktop \
+             http://www.xora.org.uk/oe/links2.png"
 
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/packages/links/links.inc b/packages/links/links.inc
new file mode 100644
index 0000000000..2d299d3b57
--- /dev/null
+++ b/packages/links/links.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng flex openssl zlib"
+
+LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}"
+
+SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
+           file://ac-prog-cxx.patch;patch=1 \
+           file://cookies-save-0.96.patch;patch=1 \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+
+inherit autotools
+
+S = "${WORKDIR}/links-${LPV}"
+
diff --git a/packages/links/links_2.0+2.1pre26.bb b/packages/links/links_2.0+2.1pre26.bb
new file mode 100644
index 0000000000..6fcf8cef84
--- /dev/null
+++ b/packages/links/links_2.0+2.1pre26.bb
@@ -0,0 +1,11 @@
+require links.inc
+
+DEPENDS += "gpm"
+RCONFLICTS="links-x11"
+PR = "r0"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+	        --without-libtiff --without-svgalib --with-fb \
+	        --without-directfb --without-pmshell --without-atheos \
+	        --without-x --without-sdl"
diff --git a/packages/links/links_2.1pre23.bb b/packages/links/links_2.1pre23.bb
deleted file mode 100644
index d8519950c6..0000000000
--- a/packages/links/links_2.1pre23.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-HOMEPAGE = "http://links.twibright.com/"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng gpm flex openssl zlib"
-RCONFLICTS="links-x11"
-PR = "r0"
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
-	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
-	        --without-libtiff --without-svgalib --with-fb \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x --without-sdl"
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig
index 7fadc7ae3a..ea1a929163 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/hx4700/defconfig
@@ -1405,7 +1405,7 @@ CONFIG_CLASS_LEDS=y
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 # CONFIG_EXT2_FS_SECURITY is not set
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh4.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb
index b34d4630a0..b34d4630a0 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.19-hh4.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh6.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh6.bb
new file mode 100644
index 0000000000..b34d4630a0
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh6.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty b/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
+++ /dev/null
diff --git a/packages/findutils/findutils-4.1.20/.mtn2git_empty b/packages/linux/linux-rp-2.6.19+git/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/findutils/findutils-4.1.20/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.19+git/.mtn2git_empty
diff --git a/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch
index a80a1d5528..a80a1d5528 100644
--- a/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-akita b/packages/linux/linux-rp-2.6.19+git/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-akita
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0 b/packages/linux/linux-rp-2.6.19+git/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-c7x0
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-collie b/packages/linux/linux-rp-2.6.19+git/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-collie
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000 b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
index ea56989b75..ea56989b75 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-poodle b/packages/linux/linux-rp-2.6.19+git/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-poodle
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm b/packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm
index abb6726556..abb6726556 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86 b/packages/linux/linux-rp-2.6.19+git/defconfig-qemux86
index fb66874b90..fb66874b90 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-qemux86
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-spitz b/packages/linux/linux-rp-2.6.19+git/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-spitz
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-tosa b/packages/linux/linux-rp-2.6.19+git/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-tosa
diff --git a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch
index b09acacadd..b09acacadd 100644
--- a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch
index 9ece71331a..9ece71331a 100644
--- a/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch
index 409daf03e6..409daf03e6 100644
--- a/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch
+++ b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch
index 097659abad..405d4ec124 100644
--- a/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch
@@ -2182,7 +2182,7 @@ Index: git/fs/squashfs/inode.c
 +static struct inode *squashfs_alloc_inode(struct super_block *sb)
 +{
 +	struct squashfs_inode_info *ei;
-+	ei = kmem_cache_alloc(squashfs_inode_cachep, SLAB_KERNEL);
++	ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL);
 +	if (!ei)
 +		return NULL;
 +	return &ei->vfs_inode;
diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch b/packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch
index b6ce56eea4..b6ce56eea4 100644
--- a/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch b/packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch
index 9fdd2962c9..9fdd2962c9 100644
--- a/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch b/packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch
index 2f1b47d783..2f1b47d783 100644
--- a/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch b/packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch
index 00bac40db5..00bac40db5 100644
--- a/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch
index 624098bc64..624098bc64 100644
--- a/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch b/packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch
index aef3a047c1..aef3a047c1 100644
--- a/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch
index 78e81ea83a..78e81ea83a 100644
--- a/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch
+++ b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch
index 5179b47cc4..5179b47cc4 100644
--- a/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch
+++ b/packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-rp_2.6.18+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index c25307cdec..f5af2ae05e 100644
--- a/packages/linux/linux-rp_2.6.18+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -14,31 +14,31 @@ DEFAULT_PREFERENCE = "-1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ae99a78af33f00565a05dbbc6ca9b247fed002c5 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc1 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
+           ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
-           ${RPSRC}/pxa_keys-r5.patch;patch=1 \
-           ${RPSRC}/tsc2101-r14.patch;patch=1 \
+           ${RPSRC}/pxa_keys-r6.patch;patch=1 \
+           ${RPSRC}/tsc2101-r15.patch;patch=1 \
            ${RPSRC}/hx2750_test1-r4.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r6.patch;patch=1 \
-           ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \
+           ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
+           ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \
            ${DOSRC}/kexec-arm-r3.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
-           ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \
+           ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
-           file://add-oz-release-string.patch;patch=1;status=unmergable \
            ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
            ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
            ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index b13b127722..3f0472ecdd 100644
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -16,6 +16,8 @@ DEFAULT_PREFERENCE = "-1"
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
+           ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \
+           ${RPSRC}/pxa_irda_susres_fix-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -27,12 +29,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
+           ${RPSRC}/usb_pxa27x_udc-r2.patch;patch=1 \
            ${DOSRC}/kexec-arm-r3.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
-           ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \
+           ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/gbluezconf/.mtn2git_empty b/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gbluezconf/.mtn2git_empty
+++ b/packages/linux/linux-smdk2440-2.6.19/.mtn2git_empty
diff --git a/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch b/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch
new file mode 100644
index 0000000000..d785cb885f
--- /dev/null
+++ b/packages/linux/linux-smdk2440-2.6.19/smdk2440-touchscreen-r2.patch
@@ -0,0 +1,532 @@
+Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c
+===================================================================
+--- /dev/null
++++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c
+@@ -0,0 +1,351 @@
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
++ * iPAQ H1940 touchscreen support
++ *
++ * ChangeLog
++ *
++ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
++ *	- added clock (de-)allocation code
++ *
++ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org>
++ *      - h1940_ -> s3c2410 (this driver is now also used on the n30
++ *        machines :P)
++ *      - Debug messages are now enabled with the config option
++ *        TOUCHSCREEN_S3C2410_DEBUG
++ *      - Changed the way the value are read
++ *      - Input subsystem should now work
++ *      - Use ioremap and readl/writel
++ *
++ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org>
++ *      - Make use of some undocumented features of the touchscreen
++ *        controller
++ *
++ */
++
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/input.h>
++#include <linux/init.h>
++#include <linux/serio.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/clk.h>
++#include <asm/io.h>
++#include <asm/irq.h>
++
++#include <asm/arch/regs-adc.h>
++#include <asm/arch/regs-gpio.h>
++#include <asm/arch/ts.h>
++
++/* For ts.dev.id.version */
++#define S3C2410TSVERSION	0x0101
++
++#define WAIT4INT(x)  (((x)<<8) | \
++		     S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
++		     S3C2410_ADCTSC_XY_PST(3))
++
++#define AUTOPST	     (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
++		     S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
++
++#define DEBUG_LVL    KERN_DEBUG
++
++MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
++MODULE_DESCRIPTION("s3c2410 touchscreen driver");
++MODULE_LICENSE("GPL");
++
++/*
++ * Definitions & global arrays.
++ */
++
++
++static char *s3c2410ts_name = "s3c2410 TouchScreen";
++
++/*
++ * Per-touchscreen data.
++ */
++
++struct s3c2410ts {
++	struct input_dev *dev;
++	long xp;
++	long yp;
++	int count;
++	int shift;
++};
++
++static struct s3c2410ts ts;
++static void __iomem *base_addr;
++
++static inline void s3c2410_ts_connect(void)
++{
++	s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
++	s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON);
++	s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON);
++	s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
++}
++
++static void touch_timer_fire(unsigned long data)
++{
++  	unsigned long data0;
++  	unsigned long data1;
++	int updown;
++
++  	data0 = readl(base_addr+S3C2410_ADCDAT0);
++  	data1 = readl(base_addr+S3C2410_ADCDAT1);
++
++ 	updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
++
++ 	if (updown) {
++ 		if (ts.count != 0) {
++ 			ts.xp >>= ts.shift;
++ 			ts.yp >>= ts.shift;
++
++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
++ 			{
++ 				struct timeval tv;
++ 				do_gettimeofday(&tv);
++ 				printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
++ 			}
++#endif
++
++ 			input_report_abs(ts.dev, ABS_Y, ts.xp);
++ 			input_report_abs(ts.dev, ABS_X, ts.yp);
++
++ 			input_report_key(ts.dev, BTN_TOUCH, 1);
++ 			input_report_abs(ts.dev, ABS_PRESSURE, 1);
++ 			input_sync(ts.dev);
++ 		}
++
++ 		ts.count = 0;
++
++ 		writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
++ 		writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
++ 	} else {
++ 		ts.count = 0;
++
++		input_report_abs(ts.dev, ABS_Y, ts.xp);
++ 		input_report_abs(ts.dev, ABS_X, ts.yp);
++	
++ 		input_report_key(ts.dev, BTN_TOUCH, 0);
++ 		input_report_abs(ts.dev, ABS_PRESSURE, 0);
++ 		input_sync(ts.dev);
++
++ 		writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
++ 	}
++}
++
++static struct timer_list touch_timer =
++		TIMER_INITIALIZER(touch_timer_fire, 0, 0);
++
++static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs)
++{
++	unsigned long data0;
++	unsigned long data1;
++	int updown;
++
++	data0 = readl(base_addr+S3C2410_ADCDAT0);
++	data1 = readl(base_addr+S3C2410_ADCDAT1);
++
++	updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
++
++	/* TODO we should never get an interrupt with updown set while
++	 * the timer is running, but maybe we ought to verify that the
++	 * timer isn't running anyways. */
++
++	if (updown)
++		touch_timer_fire(0);
++
++	return IRQ_HANDLED;
++}
++
++
++static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs)
++{
++	unsigned long data0;
++	unsigned long data1;
++
++	data0 = readl(base_addr+S3C2410_ADCDAT0);
++	data1 = readl(base_addr+S3C2410_ADCDAT1);
++
++	ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
++	ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
++	ts.count++;
++
++        if (ts.count < (1<<ts.shift)) {
++		writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
++		writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
++	} else {
++		mod_timer(&touch_timer, jiffies+1);
++		writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
++	}
++
++	return IRQ_HANDLED;
++}
++
++static struct clk	*adc_clock;
++
++/*
++ * The functions for inserting/removing us as a module.
++ */
++
++static int __init s3c2410ts_probe(struct platform_device *pdev)
++{
++	struct s3c2410_ts_mach_info *info;
++	struct input_dev *input_dev;
++
++	info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
++
++	if (!info)
++	{
++		printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
++		return -EINVAL;
++	}
++
++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
++	printk(DEBUG_LVL "Entering s3c2410ts_init\n");
++#endif
++
++	adc_clock = clk_get(NULL, "adc");
++	if (!adc_clock) {
++		printk(KERN_ERR "failed to get adc clock source\n");
++		return -ENOENT;
++	}
++	clk_enable(adc_clock);
++
++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
++	printk(DEBUG_LVL "got and enabled clock\n");
++#endif
++
++	base_addr=ioremap(S3C2410_PA_ADC,0x20);
++	if (base_addr == NULL) {
++		printk(KERN_ERR "Failed to remap register block\n");
++		return -ENOMEM;
++	}
++
++
++	/* Configure GPIOs */
++	s3c2410_ts_connect();
++
++	if ((info->presc&0xff) > 0)
++		writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
++			     base_addr+S3C2410_ADCCON);
++	else
++		writel(0,base_addr+S3C2410_ADCCON);
++
++
++	/* Initialise registers */
++	if ((info->delay&0xffff) > 0)
++		writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
++
++	writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
++
++	/* Initialise input stuff */
++	memset(&ts, 0, sizeof(struct s3c2410ts));
++	input_dev = input_allocate_device();
++
++	if (!input_dev) {
++		printk(KERN_ERR "Unable to allocate the input device !!\n");
++		return -ENOMEM;
++	}
++
++	ts.dev = input_dev;
++	ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS);
++	ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
++	input_set_abs_params(ts.dev, ABS_X, 0x10, 0x3FF, 0, 0);
++	input_set_abs_params(ts.dev, ABS_Y, 0x10, 0x3FF, 0, 0);
++	input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
++
++	ts.dev->private = &ts;
++	ts.dev->name = s3c2410ts_name;
++	ts.dev->id.bustype = BUS_RS232;
++	ts.dev->id.vendor = 0xDEAD;
++	ts.dev->id.product = 0xBEEF;
++	ts.dev->id.version = S3C2410TSVERSION;
++
++	ts.shift = info->oversampling_shift;
++
++	/* Get irqs */
++	if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM,
++		"s3c2410_action", ts.dev)) {
++		printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n");
++		iounmap(base_addr);
++		return -EIO;
++	}
++	if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM,
++			"s3c2410_action", ts.dev)) {
++		printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n");
++		iounmap(base_addr);
++		return -EIO;
++	}
++
++	printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name);
++
++	/* All went ok, so register to the input system */
++	input_register_device(ts.dev);
++
++	return 0;
++}
++
++static int s3c2410ts_remove(struct platform_device *pdev)
++{
++	disable_irq(IRQ_ADC);
++	disable_irq(IRQ_TC);
++	free_irq(IRQ_TC,ts.dev);
++	free_irq(IRQ_ADC,ts.dev);
++
++	if (adc_clock) {
++		clk_disable(adc_clock);
++		clk_put(adc_clock);
++		adc_clock = NULL;
++	}
++
++	input_unregister_device(ts.dev);
++	iounmap(base_addr);
++
++	return 0;
++}
++
++static struct platform_driver s3c2410ts_driver = {
++       .driver         = {
++	       .name   = "s3c2410-ts",
++	       .owner  = THIS_MODULE,
++       },
++       .probe          = s3c2410ts_probe,
++       .remove         = s3c2410ts_remove,
++};
++
++
++static int __init s3c2410ts_init(void)
++{
++	return platform_driver_register(&s3c2410ts_driver);
++}
++
++static void __exit s3c2410ts_exit(void)
++{
++	platform_driver_unregister(&s3c2410ts_driver);
++}
++
++module_init(s3c2410ts_init);
++module_exit(s3c2410ts_exit);
++
++/*
++    Local variables:
++        compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.."
++        c-basic-offset: 8
++    End:
++*/
+Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c
++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c
+@@ -28,6 +28,7 @@
+ #include <asm/irq.h>
+ 
+ #include <asm/arch/regs-serial.h>
++#include <asm/arch/ts.h>
+ 
+ #include "devs.h"
+ #include "cpu.h"
+@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand =
+ 
+ EXPORT_SYMBOL(s3c_device_nand);
+ 
++/* Touchscreen */
++struct platform_device s3c_device_ts = {
++	.name		  = "s3c2410-ts",
++	.id		  = -1,
++};
++
++EXPORT_SYMBOL(s3c_device_ts);
++
++static struct s3c2410_ts_mach_info s3c2410ts_info;
++
++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
++{
++	memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info));
++	s3c_device_ts.dev.platform_data = &s3c2410ts_info;
++}
++EXPORT_SYMBOL(set_s3c2410ts_info);
++
+ /* USB Device (Gadget)*/
+ 
+ static struct resource s3c_usbgadget_resource[] = {
+Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h
++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h
+@@ -41,6 +41,8 @@ extern struct platform_device s3c_device
+ extern struct platform_device s3c_device_timer3;
+ 
+ extern struct platform_device s3c_device_usbgadget;
++extern struct platform_device s3c_device_ts;
++
+ 
+ /* s3c2440 specific devices */
+ 
+Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c
++++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c
+@@ -38,6 +38,7 @@
+ 
+ #include <asm/arch/idle.h>
+ #include <asm/arch/fb.h>
++#include <asm/arch/ts.h>
+ 
+ #include "s3c2410.h"
+ #include "s3c2440.h"
+@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_
+ 	&s3c_device_wdt,
+ 	&s3c_device_i2c,
+ 	&s3c_device_iis,
++	&s3c_device_ts,
+ };
+ 
+ static struct s3c24xx_board smdk2440_board __initdata = {
+@@ -184,6 +186,13 @@ static struct s3c24xx_board smdk2440_boa
+ 	.devices_count = ARRAY_SIZE(smdk2440_devices)
+ };
+ 
++static struct s3c2410_ts_mach_info smdk2440_ts_cfg __initdata = {
++		.delay = 10000,
++		.presc = 49,
++		.oversampling_shift = 2,
++};
++
++
+ static void __init smdk2440_map_io(void)
+ {
+ 	s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc));
+@@ -195,6 +204,7 @@ static void __init smdk2440_map_io(void)
+ static void __init smdk2440_machine_init(void)
+ {
+ 	s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg);
++	set_s3c2410ts_info(&smdk2440_ts_cfg);
+ 
+ 	smdk_machine_init();
+ }
+Index: linux-2.6.19/drivers/input/touchscreen/Kconfig
+===================================================================
+--- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig
++++ linux-2.6.19/drivers/input/touchscreen/Kconfig
+@@ -49,6 +49,25 @@ config TOUCHSCREEN_CORGI
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called corgi_ts.
+ 
++config TOUCHSCREEN_S3C2410
++	tristate "Samsung S3C2410 touchscreen input driver"
++	depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN
++	select SERIO
++	help
++	  Say Y here if you have the s3c2410 touchscreen.
++
++	  If unsure, say N.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called s3c2410_ts.
++
++config TOUCHSCREEN_S3C2410_DEBUG
++	boolean "Samsung S3C2410 touchscreen debug messages"
++	depends on TOUCHSCREEN_S3C2410
++	help
++	  Select this if you want debug messages
++
++
+ config TOUCHSCREEN_GUNZE
+ 	tristate "Gunze AHL-51S touchscreen"
+ 	select SERIO
+Index: linux-2.6.19/drivers/input/touchscreen/Makefile
+===================================================================
+--- linux-2.6.19.orig/drivers/input/touchscreen/Makefile
++++ linux-2.6.19/drivers/input/touchscreen/Makefile
+@@ -15,3 +15,4 @@ obj-$(CONFIG_TOUCHSCREEN_HP600)	+= hp680
+ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)	+= penmount.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
++obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o
+Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h
+===================================================================
+--- /dev/null
++++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h
+@@ -0,0 +1,28 @@
++/* linux/include/asm/arch-s3c2410/ts.h
++ *
++ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
++ *
++ *
++ * 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 Software Foundation.
++ *
++ *
++ *  Changelog:
++ *     24-Mar-2005     RTP     Created file
++ *     03-Aug-2005     RTP     Renamed to ts.h
++ */
++
++#ifndef __ASM_ARM_TS_H
++#define __ASM_ARM_TS_H
++
++struct s3c2410_ts_mach_info {
++       int             delay;
++       int             presc;
++       int             oversampling_shift;
++};
++
++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
++
++#endif /* __ASM_ARM_TS_H */
++
+Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h
+===================================================================
+--- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h
++++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h
+@@ -41,7 +41,7 @@
+ #define S3C2410_ADCTSC_XP_SEN		(1<<4)
+ #define S3C2410_ADCTSC_PULL_UP_DISABLE	(1<<3)
+ #define S3C2410_ADCTSC_AUTO_PST		(1<<2)
+-#define S3C2410_ADCTSC_XY_PST		(0x3<<0)
++#define S3C2410_ADCTSC_XY_PST(x)	(((x)&0x3)<<0)
+ 
+ /* ADCDAT0 Bits */
+ #define S3C2410_ADCDAT0_UPDOWN		(1<<15)
diff --git a/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch b/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch
new file mode 100644
index 0000000000..d03fd94017
--- /dev/null
+++ b/packages/linux/linux-smdk2440/smdk2440-touchscreen-r3.patch
@@ -0,0 +1,529 @@
+Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.c
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.c
++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.c
+@@ -26,6 +26,7 @@
+ #include <asm/hardware.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
++#include <asm/arch/ts.h>
+ 
+ #include <asm/arch/regs-serial.h>
+ 
+@@ -204,6 +205,23 @@ struct platform_device s3c_device_nand =
+ 
+ EXPORT_SYMBOL(s3c_device_nand);
+ 
++/* Touchscreen */
++struct platform_device s3c_device_ts = {
++	.name		  = "s3c2410-ts",
++	.id		  = -1,
++};
++
++EXPORT_SYMBOL(s3c_device_ts);
++
++static struct s3c2410_ts_mach_info s3c2410ts_info;
++
++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
++{
++	memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info));
++	s3c_device_ts.dev.platform_data = &s3c2410ts_info;
++}
++EXPORT_SYMBOL(set_s3c2410ts_info);
++
+ /* USB Device (Gadget)*/
+ 
+ static struct resource s3c_usbgadget_resource[] = {
+Index: linux-2.6.19/arch/arm/mach-s3c2410/devs.h
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-s3c2410/devs.h
++++ linux-2.6.19/arch/arm/mach-s3c2410/devs.h
+@@ -41,6 +41,7 @@ extern struct platform_device s3c_device
+ extern struct platform_device s3c_device_timer3;
+ 
+ extern struct platform_device s3c_device_usbgadget;
++extern struct platform_device s3c_device_ts;
+ 
+ /* s3c2440 specific devices */
+ 
+Index: linux-2.6.19/drivers/input/touchscreen/Kconfig
+===================================================================
+--- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig
++++ linux-2.6.19/drivers/input/touchscreen/Kconfig
+@@ -49,6 +49,24 @@ config TOUCHSCREEN_CORGI
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called corgi_ts.
+ 
++config TOUCHSCREEN_S3C2410
++	tristate "Samsung S3C2410 touchscreen input driver"
++	depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN
++	select SERIO
++	help
++	  Say Y here if you have the s3c2410 touchscreen.
++
++	  If unsure, say N.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called s3c2410_ts.
++
++config TOUCHSCREEN_S3C2410_DEBUG
++	boolean "Samsung S3C2410 touchscreen debug messages"
++	depends on TOUCHSCREEN_S3C2410
++	help
++	  Select this if you want debug messages
++
+ config TOUCHSCREEN_GUNZE
+ 	tristate "Gunze AHL-51S touchscreen"
+ 	select SERIO
+Index: linux-2.6.19/drivers/input/touchscreen/Makefile
+===================================================================
+--- linux-2.6.19.orig/drivers/input/touchscreen/Makefile
++++ linux-2.6.19/drivers/input/touchscreen/Makefile
+@@ -15,3 +15,5 @@ obj-$(CONFIG_TOUCHSCREEN_HP600)	+= hp680
+ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)	+= penmount.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
++obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o
++
+Index: linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c
+===================================================================
+--- /dev/null
++++ linux-2.6.19/drivers/input/touchscreen/s3c2410_ts.c
+@@ -0,0 +1,350 @@
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
++ * iPAQ H1940 touchscreen support
++ *
++ * ChangeLog
++ *
++ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
++ *	- added clock (de-)allocation code
++ *
++ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org>
++ *      - h1940_ -> s3c2410 (this driver is now also used on the n30
++ *        machines :P)
++ *      - Debug messages are now enabled with the config option
++ *        TOUCHSCREEN_S3C2410_DEBUG
++ *      - Changed the way the value are read
++ *      - Input subsystem should now work
++ *      - Use ioremap and readl/writel
++ *
++ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org>
++ *      - Make use of some undocumented features of the touchscreen
++ *        controller
++ *
++ */
++
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/input.h>
++#include <linux/init.h>
++#include <linux/serio.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/clk.h>
++#include <asm/io.h>
++#include <asm/irq.h>
++
++#include <asm/arch/regs-adc.h>
++#include <asm/arch/regs-gpio.h>
++#include <asm/arch/ts.h>
++
++/* For ts.dev.id.version */
++#define S3C2410TSVERSION	0x0101
++
++#define WAIT4INT(x)  (((x)<<8) | \
++		     S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
++		     S3C2410_ADCTSC_XY_PST(3))
++
++#define AUTOPST	     (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
++		     S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
++
++#define DEBUG_LVL    KERN_DEBUG
++
++MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
++MODULE_DESCRIPTION("s3c2410 touchscreen driver");
++MODULE_LICENSE("GPL");
++
++/*
++ * Definitions & global arrays.
++ */
++
++
++static char *s3c2410ts_name = "s3c2410 TouchScreen";
++
++/*
++ * Per-touchscreen data.
++ */
++
++struct s3c2410ts {
++	struct input_dev *dev;
++	long xp;
++	long yp;
++	int count;
++	int shift;
++};
++
++static struct s3c2410ts ts;
++static void __iomem *base_addr;
++
++static inline void s3c2410_ts_connect(void)
++{
++	s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
++	s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON);
++	s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON);
++	s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
++}
++
++static void touch_timer_fire(unsigned long data)
++{
++  	unsigned long data0;
++  	unsigned long data1;
++	int updown;
++
++  	data0 = readl(base_addr+S3C2410_ADCDAT0);
++  	data1 = readl(base_addr+S3C2410_ADCDAT1);
++
++ 	updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
++
++ 	if (updown) {
++ 		if (ts.count != 0) {
++ 			ts.xp >>= ts.shift;
++ 			ts.yp >>= ts.shift;
++
++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
++ 			{
++ 				struct timeval tv;
++ 				do_gettimeofday(&tv);
++ 				printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
++ 			}
++#endif
++
++ 			input_report_abs(ts.dev, ABS_X, ts.xp);
++ 			input_report_abs(ts.dev, ABS_Y, ts.yp);
++
++ 			input_report_key(ts.dev, BTN_TOUCH, 1);
++ 			input_report_abs(ts.dev, ABS_PRESSURE, 1);
++ 			input_sync(ts.dev);
++ 		}
++
++ 		ts.xp = 0;
++ 		ts.yp = 0;
++ 		ts.count = 0;
++
++ 		writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
++ 		writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
++ 	} else {
++ 		ts.count = 0;
++
++ 		input_report_key(ts.dev, BTN_TOUCH, 0);
++ 		input_report_abs(ts.dev, ABS_PRESSURE, 0);
++ 		input_sync(ts.dev);
++
++ 		writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
++ 	}
++}
++
++static struct timer_list touch_timer =
++		TIMER_INITIALIZER(touch_timer_fire, 0, 0);
++
++static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs)
++{
++	unsigned long data0;
++	unsigned long data1;
++	int updown;
++
++	data0 = readl(base_addr+S3C2410_ADCDAT0);
++	data1 = readl(base_addr+S3C2410_ADCDAT1);
++
++	updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
++
++	/* TODO we should never get an interrupt with updown set while
++	 * the timer is running, but maybe we ought to verify that the
++	 * timer isn't running anyways. */
++
++	if (updown)
++		touch_timer_fire(0);
++
++	return IRQ_HANDLED;
++}
++
++
++static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs)
++{
++	unsigned long data0;
++	unsigned long data1;
++
++	data0 = readl(base_addr+S3C2410_ADCDAT0);
++	data1 = readl(base_addr+S3C2410_ADCDAT1);
++
++	ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
++	ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
++	ts.count++;
++
++        if (ts.count < (1<<ts.shift)) {
++		writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
++		writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
++	} else {
++		mod_timer(&touch_timer, jiffies+1);
++		writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
++	}
++
++	return IRQ_HANDLED;
++}
++
++static struct clk	*adc_clock;
++
++/*
++ * The functions for inserting/removing us as a module.
++ */
++
++static int __init s3c2410ts_probe(struct platform_device *pdev)
++{
++	struct s3c2410_ts_mach_info *info;
++	struct input_dev *input_dev;
++
++	info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
++
++	if (!info)
++	{
++		printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
++		return -EINVAL;
++	}
++
++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
++	printk(DEBUG_LVL "Entering s3c2410ts_init\n");
++#endif
++
++	adc_clock = clk_get(NULL, "adc");
++	if (!adc_clock) {
++		printk(KERN_ERR "failed to get adc clock source\n");
++		return -ENOENT;
++	}
++	clk_enable(adc_clock);
++
++#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
++	printk(DEBUG_LVL "got and enabled clock\n");
++#endif
++
++	base_addr=ioremap(S3C2410_PA_ADC,0x20);
++	if (base_addr == NULL) {
++		printk(KERN_ERR "Failed to remap register block\n");
++		return -ENOMEM;
++	}
++
++
++	/* Configure GPIOs */
++	s3c2410_ts_connect();
++
++	if ((info->presc&0xff) > 0)
++		writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
++			     base_addr+S3C2410_ADCCON);
++	else
++		writel(0,base_addr+S3C2410_ADCCON);
++
++
++	/* Initialise registers */
++	if ((info->delay&0xffff) > 0)
++		writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
++
++	writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
++
++	/* Initialise input stuff */
++	memset(&ts, 0, sizeof(struct s3c2410ts));
++	input_dev = input_allocate_device();
++
++	if (!input_dev) {
++		printk(KERN_ERR "Unable to allocate the input device !!\n");
++		return -ENOMEM;
++	}
++
++	ts.dev = input_dev;
++	ts.dev->evbit[0] = BIT(EV_SYN) | BIT(EV_KEY) | BIT(EV_ABS);
++	ts.dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
++	input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0);
++	input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0);
++	input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
++
++	ts.dev->private = &ts;
++	ts.dev->name = s3c2410ts_name;
++	ts.dev->id.bustype = BUS_RS232;
++	ts.dev->id.vendor = 0xDEAD;
++	ts.dev->id.product = 0xBEEF;
++	ts.dev->id.version = S3C2410TSVERSION;
++
++	ts.shift = info->oversampling_shift;
++
++	/* Get irqs */
++	if (request_irq(IRQ_ADC, stylus_action, SA_SAMPLE_RANDOM,
++		"s3c2410_action", ts.dev)) {
++		printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n");
++		iounmap(base_addr);
++		return -EIO;
++	}
++	if (request_irq(IRQ_TC, stylus_updown, SA_SAMPLE_RANDOM,
++			"s3c2410_action", ts.dev)) {
++		printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n");
++		iounmap(base_addr);
++		return -EIO;
++	}
++
++	printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name);
++
++	/* All went ok, so register to the input system */
++	input_register_device(ts.dev);
++
++	return 0;
++}
++
++static int s3c2410ts_remove(struct platform_device *pdev)
++{
++	disable_irq(IRQ_ADC);
++	disable_irq(IRQ_TC);
++	free_irq(IRQ_TC,ts.dev);
++	free_irq(IRQ_ADC,ts.dev);
++
++	if (adc_clock) {
++		clk_disable(adc_clock);
++		clk_put(adc_clock);
++		adc_clock = NULL;
++	}
++
++	input_unregister_device(ts.dev);
++	iounmap(base_addr);
++
++	return 0;
++}
++
++static struct platform_driver s3c2410ts_driver = {
++       .driver         = {
++	       .name   = "s3c2410-ts",
++	       .owner  = THIS_MODULE,
++       },
++       .probe          = s3c2410ts_probe,
++       .remove         = s3c2410ts_remove,
++};
++
++
++static int __init s3c2410ts_init(void)
++{
++	return platform_driver_register(&s3c2410ts_driver);
++}
++
++static void __exit s3c2410ts_exit(void)
++{
++	platform_driver_unregister(&s3c2410ts_driver);
++}
++
++module_init(s3c2410ts_init);
++module_exit(s3c2410ts_exit);
++
++/*
++    Local variables:
++        compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.."
++        c-basic-offset: 8
++    End:
++*/
+Index: linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h
+===================================================================
+--- linux-2.6.19.orig/include/asm-arm/arch-s3c2410/regs-adc.h
++++ linux-2.6.19/include/asm-arm/arch-s3c2410/regs-adc.h
+@@ -41,7 +41,7 @@
+ #define S3C2410_ADCTSC_XP_SEN		(1<<4)
+ #define S3C2410_ADCTSC_PULL_UP_DISABLE	(1<<3)
+ #define S3C2410_ADCTSC_AUTO_PST		(1<<2)
+-#define S3C2410_ADCTSC_XY_PST		(0x3<<0)
++#define S3C2410_ADCTSC_XY_PST(x)	(((x)&0x3)<<0)
+ 
+ /* ADCDAT0 Bits */
+ #define S3C2410_ADCDAT0_UPDOWN		(1<<15)
+Index: linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h
+===================================================================
+--- /dev/null
++++ linux-2.6.19/include/asm-arm/arch-s3c2410/ts.h
+@@ -0,0 +1,28 @@
++/* linux/include/asm/arch-s3c2410/ts.h
++ *
++ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
++ *
++ *
++ * 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 Software Foundation.
++ *
++ *
++ *  Changelog:
++ *     24-Mar-2005     RTP     Created file
++ *     03-Aug-2005     RTP     Renamed to ts.h
++ */
++
++#ifndef __ASM_ARM_TS_H
++#define __ASM_ARM_TS_H
++
++struct s3c2410_ts_mach_info {
++       int             delay;
++       int             presc;
++       int             oversampling_shift;
++};
++
++void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
++
++#endif /* __ASM_ARM_TS_H */
++
+Index: linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c
+===================================================================
+--- linux-2.6.19.orig/arch/arm/mach-s3c2410/mach-smdk2440.c
++++ linux-2.6.19/arch/arm/mach-s3c2410/mach-smdk2440.c
+@@ -35,6 +35,7 @@
+ #include <asm/arch/regs-serial.h>
+ #include <asm/arch/regs-gpio.h>
+ #include <asm/arch/regs-lcd.h>
++#include <asm/arch/ts.h>
+ 
+ #include <asm/arch/idle.h>
+ #include <asm/arch/fb.h>
+@@ -177,6 +178,7 @@ static struct platform_device *smdk2440_
+ 	&s3c_device_wdt,
+ 	&s3c_device_i2c,
+ 	&s3c_device_iis,
++	&s3c_device_ts,
+ };
+ 
+ static struct s3c24xx_board smdk2440_board __initdata = {
+@@ -184,6 +186,12 @@ static struct s3c24xx_board smdk2440_boa
+ 	.devices_count = ARRAY_SIZE(smdk2440_devices)
+ };
+ 
++static struct s3c2410_ts_mach_info qt2410_ts_cfg = {
++	.delay = 10000,
++	.presc = 49,
++	.oversampling_shift = 2,
++};
++
+ static void __init smdk2440_map_io(void)
+ {
+ 	s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc));
+@@ -195,6 +203,7 @@ static void __init smdk2440_map_io(void)
+ static void __init smdk2440_machine_init(void)
+ {
+ 	s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg);
++	set_s3c2410ts_info(&qt2410_ts_cfg);
+ 
+ 	smdk_machine_init();
+ }
diff --git a/packages/linux/linux-smdk2440_2.6.18.bb b/packages/linux/linux-smdk2440_2.6.19.bb
index 701e08a7c4..039e412919 100644
--- a/packages/linux/linux-smdk2440_2.6.18.bb
+++ b/packages/linux/linux-smdk2440_2.6.19.bb
@@ -5,9 +5,10 @@ PR = "r1"
 
 GGSRC = "http://www.xora.org.uk/oe/patches/"
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            ${GGSRC}smdk2440-cs89x0-r1.patch;patch=1 \
-           ${GGSRC}smdk2440-touchscreen-r1.patch;patch=1 \
+           file://smdk2440-touchscreen-r3.patch;patch=1 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.6.patch;patch=1 \
            file://defconfig-smdk2440"
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 381900e038..b001763710 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -9,7 +9,7 @@ PXAV = "1"
 PR = "r5"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
-	   http://lorien.handhelds.org/ftp.arm.linux.org.uk/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \
+	   http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \
 	   file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
 	   file://mnci-combined.patch;patch=1"
 
diff --git a/packages/live555/live555_20051005.bb b/packages/live555/live555_20051005.bb
index bc25517ea9..24f13b6983 100644
--- a/packages/live555/live555_20051005.bb
+++ b/packages/live555/live555_20051005.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://live.com/"
 LICENSE = "LGPL"
 SECTION = "devel"
 
-SRC_URI = "http://live.com/liveMedia/public/live.2005.10.05.tar.gz \
+SRC_URI = "http://downloads.videolan.org/pub/videolan/vlc/0.8.5/contrib/live.2005.10.05.tar.gz \
            file://config.linux-cross"
 
 S = "${WORKDIR}/live"
diff --git a/packages/gcc/gcc-4.1-20060217/.mtn2git_empty b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gcc/gcc-4.1-20060217/.mtn2git_empty
+++ b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch
new file mode 100644
index 0000000000..f285540d06
--- /dev/null
+++ b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch
@@ -0,0 +1,12 @@
+Index: madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc
+===================================================================
+--- madwifi-ng-r1844-20061208.orig/hal/public/xscale-be-elf.inc
++++ madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc
+@@ -77,5 +77,5 @@ AH_REGOPS_FUNC=1
+ 
+ LDOPTS=	-EB
+ COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
+-	-mtune=xscale  -mshort-load-bytes
++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \
++	-mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch
new file mode 100644
index 0000000000..3224324699
--- /dev/null
+++ b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch
@@ -0,0 +1,10 @@
+Index: madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc
+===================================================================
+--- madwifi-ng-r1844-20061208.orig/hal/public/xscale-le-elf.inc
++++ madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc
+@@ -79,4 +79,4 @@ AH_REGOPS_FUNC=1
+ LDOPTS=	-EL
+ COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
+ COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
+-	-mapcs-32 -mtune=xscale  -mshort-load-bytes
++	-mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng_r1844-20061208.bb b/packages/madwifi/madwifi-ng_r1844-20061208.bb
new file mode 100644
index 0000000000..42d8ccafe4
--- /dev/null
+++ b/packages/madwifi/madwifi-ng_r1844-20061208.bb
@@ -0,0 +1,3 @@
+PR = "r0"
+
+require madwifi-ng_r.inc
diff --git a/packages/mailx/mailx_8.1.2-0.20031014cvs.bb b/packages/mailx/mailx_8.1.2-0.20031014cvs.bb
deleted file mode 100644
index 973f7ed121..0000000000
--- a/packages/mailx/mailx_8.1.2-0.20031014cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "console/network"
-DEPENDS = "liblockfile"
-DESCRIPTION = "mailx is the traditional command-line-mode \
-mail user agent."
-LICENSE = "GPL"
-SRC_URI = "${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}.orig.tar.gz \
-	   ${DEBIAN_MIRROR}/main/m/mailx/mailx_${PV}-1.diff.gz;patch=1 \
-	   file://install.patch;patch=1"
-S = "${WORKDIR}/mailx-${PV}.orig"
-
-CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/man/man_1.5m2.bb b/packages/man/man_1.5m2.bb
deleted file mode 100644
index 10e0576b3c..0000000000
--- a/packages/man/man_1.5m2.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-LICENSE = "GPL"
-SECTION = "base"
-DESCRIPTION = "The man page suite, including man, apropos, \
-and whatis consists of programs that are used to read most \
-of the documentation available on a Linux system."
-RDEPENDS_${PN} = "less groff"
-PR = "r1"
-
-SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/man/man-${PV}.tar.bz2"
-
-EXTRA_OEMAKE = ""
-GS = "-DGREPSILENT=\"q\""
-DEFS = "-DUSG -DDO_COMPRESS ${GS}"
-
-do_configure() {
-	./configure -d -confdir ${sysconfdir}
-}
-
-do_compile() {
-	(cd src; ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-		makemsg.c -o makemsg)
-	oe_runmake 'DEFS=${DEFS}'
-}
-
-do_install() {
-	oe_runmake 'PREFIX=${D}' install
-}
-
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
-	       ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	       /bin /sbin /lib/*/ /lib/*.so*"
diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb
index b05c935513..e46b5b03cc 100644
--- a/packages/man/man_1.5p.bb
+++ b/packages/man/man_1.5p.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "less groff"
 
 # Note: The default man.conf uses wrong names for GNU eqn and troff,
 # so we install our own
-SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/man/man-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/man/man-${PV}.tar.bz2 \
 		file://man.conf"
 
 # Disable parallel make or it tries to link objects before they are built
diff --git a/packages/maradns/maradns_1.0.23.bb b/packages/maradns/maradns_1.0.39.bb
index d7f02d5565..d89bcf849d 100644
--- a/packages/maradns/maradns_1.0.23.bb
+++ b/packages/maradns/maradns_1.0.39.bb
@@ -1,12 +1,11 @@
-SECTION = "console/network"
 DESCRIPTION = "A security-aware DNS server"
+SECTION = "console/network"
 HOMEPAGE = "http://www.maradns.org"
 LICENSE = "PD"
-PR = "r1"
 
-SRC_URI = "http://www.maradns.org/download/maradns-${PV}.tar.bz2 \
-	file://init \
-	file://rng-makefile-build-cc.patch;patch=1;pnum=0"
+SRC_URI = "http://www.maradns.org/download/1.0/maradns-${PV}.tar.bz2 \
+           file://init \
+           file://rng-makefile-build-cc.patch;patch=1;pnum=0"
 
 do_install() {
 	install -d ${D}${bindir}
@@ -37,7 +36,7 @@ do_install() {
 	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns
 }
 
-PACKAGES = "maradns-zone maradns-ask maradns maradns-doc"
+PACKAGES =+ "maradns-zone maradns-ask"
 FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone"
 FILES_maradns-ask = "${bindir}/askmara"
 
diff --git a/packages/masqmail/files/.mtn2git_empty b/packages/masqmail/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/masqmail/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/masqmail/files/configure-ac-glib-2-0.patch b/packages/masqmail/files/configure-ac-glib-2-0.patch
deleted file mode 100644
index c5e607f52d..0000000000
--- a/packages/masqmail/files/configure-ac-glib-2-0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- masqmail-0.2.20/configure.ac.orig	2005-11-11 16:36:05.894559778 -0800
-+++ masqmail-0.2.20/configure.ac	2005-11-11 16:36:19.935443315 -0800
-@@ -20,7 +20,7 @@ AC_STDC_HEADERS
- dnl AC_ARG_PROGRAM
- AC_PROG_RANLIB
- 
--AM_PATH_GLIB
-+AM_PATH_GLIB_2_0
- 
- dnl resolver support (default is use it)
- AC_ARG_ENABLE(resolver,
diff --git a/packages/masqmail/masqmail_0.2.20.bb b/packages/masqmail/masqmail_0.2.21.bb
index 1a64833bfc..05f377e4e5 100644
--- a/packages/masqmail/masqmail_0.2.20.bb
+++ b/packages/masqmail/masqmail_0.2.21.bb
@@ -1,19 +1,19 @@
-# MasqMail from http://innominate.org/kurth/masqmail/
-DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have a permanent internet connection eg. a home network or a single host at home. It has special support for connections to different ISPs. It replaces sendmail or other MTAs such as qmail or exim."
+DESCRIPTION = "MasqMail is a mail server designed for hosts that do not have \
+a permanent internet connection eg. a home network or a single host at home. \
+It has special support for connections to different ISPs. It replaces sendmail \
+or other MTAs such as qmail or exim."
 HOMEPAGE = "http://innominate.org/kurth/masqmail/"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r0"
-
 DEPENDS = "glib-2.0"
 
-SRC_URI = "http://innominate.org/kurth/masqmail/download/masqmail-${PV}.tar.gz"
-SRC_URI += "file://configure-ac-glib-2-0.patch;patch=1"
+SRC_URI = "${DEBIAN_MIRROR}/main/m/${PN}/${PN}_${PV}.orig.tar.gz"
+
+inherit autotools pkgconfig
 
 EXTRA_OECONF += "--disable-glibtest"
 EXTRA_OECONF += "--disable-resolver"
-EXTRA_OECONF += "--disable-debug"
 
 # These are the standard Debian values for ownership of the programs,
 # this stuff fakes out the install script chown operations then replicates
@@ -26,5 +26,3 @@ EXTRA_OECONF += "--with-user=$(id -u)"
 EXTRA_OECONF += "--with-group=$(id -g)"
 
 IPKGBUILDCMD = "ipkg-build -o ${MAIL_USER} -g ${MAIL_GROUP}"
-
-inherit autotools
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb
index 080c97c18e..00bb761433 100644
--- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "matchbox-wm libmatchbox"
 SECTION = "x11/wm"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.bz2"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.bz2"
 S = "${WORKDIR}/mb-applet-input-manager-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/matchbox-common/matchbox-common_0.8.bb b/packages/matchbox-common/matchbox-common_0.8.bb
index 74843a8873..d9cb3e3b87 100644
--- a/packages/matchbox-common/matchbox-common_0.8.bb
+++ b/packages/matchbox-common/matchbox-common_0.8.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager common files"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-common/${PV}/matchbox-common-${PV}.tar.bz2"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-common/${PV}/matchbox-common-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-common-${PV}"
 
 inherit autotools  pkgconfig
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb
index 4337a139d2..be402f9e68 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.8.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2 \
 	   file://enable-file-manager.patch;patch=1"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.8.bb b/packages/matchbox-desktop/matchbox-desktop_0.8.bb
index a0e5ab21fa..853f2cb4e9 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.8.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.8.bb
@@ -3,7 +3,8 @@ PR = "r1"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/${PV}/matchbox-desktop-${PV}.tar.bz2"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.8/matchbox-desktop-${PV}.tar.bz2"
+
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index 9475edd55e..f6600bdbcd 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Matchbox panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
 	file://automake-lossage.patch;patch=1 \
 	file://more-automake-lossage.patch;patch=1 \
 	file://make-batteryapp-less-strict.patch;patch=1"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
index f6bc0166fc..f15d16f39a 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification v
 SECTION = "x11/wm"
 PR = "r1"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
 	file://make-batteryapp-less-strict.patch;patch=1 \
 	file://wifi-location.patch;patch=1"
 S = "${WORKDIR}/matchbox-panel-${PV}"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb
index a65c017f9e..a02dff7c41 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm"
 RDEPENDS = "libmatchbox matchbox-common"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
 inherit autotools pkgconfig gettext
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
index a6a77c5441..524dc1af36 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
 	file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0"
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
index a6a77c5441..524dc1af36 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
 	file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0"
 S = "${WORKDIR}/matchbox-window-manager-${PV}"
 
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index a84b3da580..ec4261f352 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -11,7 +11,7 @@ PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
 
 # The list of packages to build for the slugos DISTRO.
 # KEEP IN ALPHABETICAL ORDER
@@ -119,7 +119,7 @@ OPENIOM_PACKAGES = "\
 	mdadm \
 	memtester \
 	mgetty \
-	miau \ 
+	miau \
 	microcom \
 	minicom \
 	mt-daapd \
diff --git a/packages/mono/.mtn2git_empty b/packages/mono/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mono/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mono/files/.mtn2git_empty b/packages/mono/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/mono/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/mono/files/install-lossage.patch b/packages/mono/files/install-lossage.patch
deleted file mode 100644
index 51fcdbbe85..0000000000
--- a/packages/mono/files/install-lossage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono-1.0/runtime/net_1_1/Makefile.am.old	2004-07-21 20:30:21.101405400 +0100
-+++ mono-1.0/runtime/net_1_1/Makefile.am	2004-07-21 20:31:05.209699920 +0100
-@@ -91,8 +91,8 @@
- 	@if test -n '$(gac_assemblies)'; then \
- 	  for i in ''$(gac_assemblies); do \
- 	    echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \
--	    MONO_PATH=$(srcdir) \
--	      $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
-+	    cd $(srcdir); MONO_PATH=$(srcdir) \
-+	      $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \
- 	  done; fi
- 
- uninstall-local:
diff --git a/packages/mono/files/libtool-lossage.patch b/packages/mono/files/libtool-lossage.patch
deleted file mode 100644
index ac6f0f801f..0000000000
--- a/packages/mono/files/libtool-lossage.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- mono-1.0/libgc/acinclude.m4.old	2004-07-21 19:10:53.059455128 +0100
-+++ mono-1.0/libgc/acinclude.m4	2004-07-21 19:10:56.881874032 +0100
-@@ -46,4 +46,3 @@
- ${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION)
- ])
- 
--sinclude(libtool.m4)
diff --git a/packages/mono/mono-native_1.0.bb b/packages/mono/mono-native_1.0.bb
deleted file mode 100644
index c0e649faee..0000000000
--- a/packages/mono/mono-native_1.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SECTION = "unknown"
-require mono_${PV}.bb
-S = "${WORKDIR}/mono-${PV}"
-DEPENDS = "glib-2.0-native"
-
-inherit native
diff --git a/packages/mono/mono_1.0.bb b/packages/mono/mono_1.0.bb
deleted file mode 100644
index 4aa543b3ef..0000000000
--- a/packages/mono/mono_1.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "unknown"
-DEPENDS = "mono-native glib-2.0"
-LICENSE = "GPL LGPL X11"
-SRC_URI = "http://mono2.ximian.com/archive/1.0/mono-1.0.tar.gz \
-	file://libtool-lossage.patch;patch=1 \
-	file://install-lossage.patch;patch=1"
-
-EXTRA_OECONF_arm = "--without-nptl"
-
-inherit autotools
-
-do_configure_prepend() {
-	rm -f libgc/libtool.m4
-}
-
-do_install() {
-	oe_runmake 'DESTDIR=${D}' mono_runtime='mint' install
-}
diff --git a/packages/monotone/files/configure.ac-no-sync-with-stdio-0.31.patch b/packages/monotone/files/configure.ac-no-sync-with-stdio-0.31.patch
new file mode 100644
index 0000000000..60759fb727
--- /dev/null
+++ b/packages/monotone/files/configure.ac-no-sync-with-stdio-0.31.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.ac	2006-12-18 12:14:47.000000000 +0100
++++ monotone-0.31/configure.ac	2006-12-18 12:15:58.022227000 +0100
+@@ -73,7 +73,6 @@
+ AC_CXX_STLPORT_HASHMAP
+ AC_CXX_TR1_UNORDERED_MAP
+ AC_CXX_TR1_UNORDERED_MAP_CONST_CORRECT
+-AC_CXX_SYNC_WITH_STDIO_WORKS
+ AC_CXX_TEMPLATE_STATIC_CONST_BUG
+ 
+ # Checks for typedefs and structures.
diff --git a/packages/monotone/monotone-6_0.31.bb b/packages/monotone/monotone-6_0.31.bb
new file mode 100644
index 0000000000..7629ff6e61
--- /dev/null
+++ b/packages/monotone/monotone-6_0.31.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "Monotone is a distributed Source Control System"
+HOMEPAGE = "http://www.venge.net/monotone"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "boost"
+
+S = "${WORKDIR}/monotone-${PV}"
+# no cross compile support - it tries to run the test program even with
+# --enable_ipv6=yes
+EXTRA_OECONF = "--disable-ipv6 \
+                --disable-dependency-tracking \
+                --disable-rpath \
+                --disable-nls \
+                --with-gnu-ld \
+                --with-bundled-lua --with-bundled-sqlite"
+
+inherit autotools 
+
+# Release 0.22 reveals bugs in g++ for thumb (g++ generates
+# relocations which the linker cannot represent)
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+PR = "r0"
+
+SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
+           file://txt2c-cross-post-0.22.patch;patch=1 \
+	   file://uclibc.database.hh.stdarg.patch;patch=1 \
+	   file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+	  "
+do_compile_append() {
+	touch testsuite
+}
+
+# This makes the testsuite as a package and renames the monotone executable
+# to include the netsync suffix.
+do_install_append() {
+        install -d ${D}${tsd}
+        install -c -m 755 testsuite ${D}${tsd}/testsuite
+        cp -pPR tests ${D}${tsd}/tests
+}
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
+tsd = "/home/monotone/${PN}"
+FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
+RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch perl perl-modules"
+
diff --git a/packages/mplayer/files/disable-executable-stack-test.patch b/packages/mplayer/files/disable-executable-stack-test.patch
new file mode 100644
index 0000000000..dc8871b6ae
--- /dev/null
+++ b/packages/mplayer/files/disable-executable-stack-test.patch
@@ -0,0 +1,30 @@
+Removes the "noexecstack" check from configure so we don't end up with:
+
+     mplayer: error while loading shared libraries: libmad.so.0: cannot 
+     enable executable stack as shared object requires: Error 14
+
+at runtime.
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- MPlayer-1.0pre8/configure~disable-executable-stack-test
++++ MPlayer-1.0pre8/configure
+@@ -7193,15 +7193,7 @@
+ fi
+ 
+ echocheck "compiler support for noexecstack"
+-cat > $TMPC <<EOF
+-int main(void) { return 0; }
+-EOF
+-if cc_check -Wl,-z,noexecstack ; then
+-  _ld_extra="-Wl,-z,noexecstack $_ld_extra"
+-  echores "yes"
+-else
+-  echores "no"
+-fi
++echores "no"
+ 
+ echocheck "ftello()"
+ # if we don't have ftello use the osdep/ compatibility module
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index 41b50bd656..3a63413d7a 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -19,6 +19,14 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \
            file://imageon-video_out.patch;patch=1"
 
+# This is required for the collie machine only as all stacks in that
+# machine seem to be set to executable by the toolchain. If someone
+# discovers this is more general than please make this more general
+# ie. for all armv4 machines.
+SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
+PACKAGE_ARCH_mplayer_collie = "collie"
+PACKAGE_ARCH_mencoder_collie = "collie"
+
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 PR = "r4"
diff --git a/packages/ncftp/ncftp/fixes.patch b/packages/ncftp/ncftp/fixes.patch
new file mode 100644
index 0000000000..557ff5c54f
--- /dev/null
+++ b/packages/ncftp/ncftp/fixes.patch
@@ -0,0 +1,22 @@
+Index: ncftp-3.2.0/ncftp/cmds.c
+===================================================================
+--- ncftp-3.2.0.orig/ncftp/cmds.c	2006-12-18 22:21:34.000000000 +0100
++++ ncftp-3.2.0/ncftp/cmds.c	2006-12-18 22:23:55.000000000 +0100
+@@ -945,7 +945,7 @@
+ 			--n;
+ 			memset(&st, 0, sizeof(st));
+ 		}
+-		(void) sprintf(modstr, "%u " PRINTF_LONG_LONG, (unsigned int) st.st_mtime, (longest_int) st.st_size);
++		(void) sprintf(modstr, "%u %ld" , (unsigned int) st.st_mtime, (longest_int) st.st_size);
+ 		if (AddLine(&modstrs, modstr) == NULL) {
+ 			DisposeLineListContents(&modstrs);
+ 			DisposeLineListContents(&rfiles);
+@@ -1006,7 +1006,7 @@
+ 			(void) fprintf(stdout, "\n");
+ 			continue;
+ 		}
+-		(void) sprintf(modstr, "%u " PRINTF_LONG_LONG, (unsigned int) st.st_mtime, (longest_int) st.st_size);
++		(void) sprintf(modstr, "%u %ld" , (unsigned int) st.st_mtime, (longest_int) st.st_size);
+ 		if (strcmp(modstr, mlp->line) == 0) {
+ 			Trace(-1, "No changes made to \"%s\".\n", rpath);
+ 			continue;
diff --git a/packages/ncftp/ncftp/make.patch b/packages/ncftp/ncftp/make.patch
new file mode 100644
index 0000000000..78bc523ee7
--- /dev/null
+++ b/packages/ncftp/ncftp/make.patch
@@ -0,0 +1,39 @@
+Index: ncftp-3.2.0/Strn/Makefile.in
+===================================================================
+--- ncftp-3.2.0.orig/Strn/Makefile.in	2006-12-18 22:11:48.000000000 +0100
++++ ncftp-3.2.0/Strn/Makefile.in	2006-12-18 22:12:48.000000000 +0100
+@@ -42,7 +42,7 @@
+ static: $(LIB)
+ 
+ $(LIB): $(OBJS)
+-	@CCDV@@AR@ r $(LIB) $(OBJS)
++	@CCDV@$(AR) r $(LIB) $(OBJS)
+ 	-@chmod 644 "$(LIB)"
+ 	-@RANLIB@ "$(LIB)"
+ 	-@echo "$(VER)" > Strn.version
+Index: ncftp-3.2.0/sio/Makefile.in
+===================================================================
+--- ncftp-3.2.0.orig/sio/Makefile.in	2006-12-18 22:15:39.000000000 +0100
++++ ncftp-3.2.0/sio/Makefile.in	2006-12-18 22:15:56.000000000 +0100
+@@ -51,7 +51,7 @@
+ 
+ $(LIB): $(OBJS)
+ 	-@/bin/rm -f $(LIB)
+-	@CCDV@@AR@ r $(LIB) $(OBJS)
++	@CCDV@$(AR) r $(LIB) $(OBJS)
+ 	-@RANLIB@ $(LIB)
+ 	-@echo $(VER) > sio.version
+ 	-@chmod a+r $(LIB) sio.h usio.h
+Index: ncftp-3.2.0/libncftp/Makefile.in
+===================================================================
+--- ncftp-3.2.0.orig/libncftp/Makefile.in	2006-12-18 22:16:42.000000000 +0100
++++ ncftp-3.2.0/libncftp/Makefile.in	2006-12-18 22:16:56.000000000 +0100
+@@ -49,7 +49,7 @@
+ 
+ $(LIB): $(OBJS)
+ 	-@/bin/rm -f $(LIB)
+-	@CCDV@@AR@ r $(LIB) $(OBJS)
++	@CCDV@$(AR) r $(LIB) $(OBJS)
+ 	-@chmod 644 $(LIB)
+ 	-@@RANLIB@ $(LIB)
+ 	@/bin/ls -l $(LIB)
diff --git a/packages/ncftp/ncftp_3.1.7.bb b/packages/ncftp/ncftp_3.1.7.bb
deleted file mode 100644
index 99673d8a97..0000000000
--- a/packages/ncftp/ncftp_3.1.7.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "A sophisticated console ftp client"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "ClarifiedArtistic"
-SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \
-	   file://acinclude.m4"
-
-inherit autotools
-
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
-}
-
-do_install () {
-	install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
-	oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
-		   'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
-		   install
-}
diff --git a/packages/ncftp/ncftp_3.1.9.bb b/packages/ncftp/ncftp_3.1.9.bb
deleted file mode 100644
index 690c7eb613..0000000000
--- a/packages/ncftp/ncftp_3.1.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "A sophisticated console ftp client"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "ClarifiedArtistic"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.ncftp.com/ncftp/older_versions/ncftp-${PV}-src.tar.gz \
-	   file://acinclude.m4"
-
-inherit autotools
-
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
-}
-
-INHIBIT_AUTO_STAGE = "1"
-
-do_install () {
-	install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
-	oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
-		   'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
-		   install
-}
diff --git a/packages/ncftp/ncftp_3.1.8.bb b/packages/ncftp/ncftp_3.2.0.bb
index 99673d8a97..ce87846ba0 100644
--- a/packages/ncftp/ncftp_3.1.8.bb
+++ b/packages/ncftp/ncftp_3.2.0.bb
@@ -2,8 +2,11 @@ DESCRIPTION = "A sophisticated console ftp client"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "ClarifiedArtistic"
+
 SRC_URI = "ftp://ftp.ncftp.com/ncftp/ncftp-${PV}-src.tar.bz2 \
-	   file://acinclude.m4"
+	   file://acinclude.m4 \
+	   file://make.patch;patch=1 \
+	   file://fixes.patch;patch=1"
 
 inherit autotools
 
@@ -11,6 +14,8 @@ do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/acinclude.m4 acinclude.m4
 }
 
+INHIBIT_AUTO_STAGE = "1"
+
 do_install () {
 	install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
 	oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb
index 1cdf1f207e..be37fb9c28 100644
--- a/packages/nis/ypbind-mt_1.18.bb
+++ b/packages/nis/ypbind-mt_1.18.bb
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html"
 
 require nis.inc
 
-SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
 
 # ypbind-mt now provides all the functionality of ypbind
 # and is used in place of it.
diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb
index 1ab9aa8ea4..07d8aee5bb 100644
--- a/packages/nis/ypserv_2.17.bb
+++ b/packages/nis/ypserv_2.17.bb
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html"
 
 require nis.inc
 
-SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
 
 # ypserv needs a database package, gdbm is currently the
 # only candidate
diff --git a/packages/nsqld/nsqld_0.5.3.bb b/packages/nsqld/nsqld_0.5.3.bb
deleted file mode 100644
index 3bf0aa4169..0000000000
--- a/packages/nsqld/nsqld_0.5.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Server process for syncing"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "${GPE_MIRROR}/nsqld-${PV}.tar.gz"
-
-S = "${WORKDIR}/nsqld-${PV}"
-
-inherit autotools pkgconfig
-
-do_install () {
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/nsqld-${PV}/nsqld ${D}${bindir}
-}
diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc
new file mode 100644
index 0000000000..4b4d859372
--- /dev/null
+++ b/packages/pango/pango.inc
@@ -0,0 +1,51 @@
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+LICENSE = "LGPL"
+
+inherit gnome
+
+
+SECTION = "x11/libs"
+
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo"
+
+PACKAGES_DYNAMIC = "pango-module-*"
+
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI += "file://no-tests.patch;patch=1 \
+           "
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+LEAD_SONAME = "libpango-1.0*"
+LIBV = "1.6.0"
+
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
+do_stage () {
+	autotools_stage_all
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+python populate_packages_prepend () {
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/packages/pango/pango_1.15.2.bb b/packages/pango/pango_1.15.2.bb
new file mode 100644
index 0000000000..8e3e8e7d3a
--- /dev/null
+++ b/packages/pango/pango_1.15.2.bb
@@ -0,0 +1 @@
+require pango.inc
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index 7a8bd6f8b5..f9cbdf11e8 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
 PR = "r2"
 
-SRC_URI = "http://pitecan.com/OpenPOBox/dist/pobox-${PV}.tgz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
            file://OpenPOBox-1.25.diff;patch=1 \
            file://remove-local-includes.patch;patch=1 \
diff --git a/packages/ipac-ng/.mtn2git_empty b/packages/portmap/portmap-5-24/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ipac-ng/.mtn2git_empty
+++ b/packages/portmap/portmap-5-24/.mtn2git_empty
diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-24/make.patch
new file mode 100644
index 0000000000..7726846b7c
--- /dev/null
+++ b/packages/portmap/portmap-5-24/make.patch
@@ -0,0 +1,73 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: portmap_5beta/Makefile
+===================================================================
+--- portmap_5beta.orig/Makefile	2006-12-19 10:32:58.000000000 +0000
++++ portmap_5beta/Makefile	2006-12-19 10:35:54.000000000 +0000
+@@ -110,6 +110,13 @@
+ #
+ #CONST   = -Dconst=
+ 
++DESTDIR =
++prefix = /usr
++sbindir = /sbin
++datadir = $(prefix)/share
++mandir = $(datadir)/man
++docdir = $(datadir)/doc/portmap
++
+ ### End of configurable stuff.
+ ##############################
+ 
+@@ -127,7 +134,7 @@
+ COPT	= $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \
+ 	$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \
+ 	$(SA_LEN) $(LOOPBACK) $(SETPGRP)
+-CFLAGS	= -Wall $(COPT) -O2 $(NSARCHS)
++CFLAGS	= -Wall -O2 $(NSARCHS)
+ OBJECTS	= portmap.o pmap_check.o from_local.o $(AUX)
+ 
+ all:	portmap pmap_dump pmap_set
+@@ -142,20 +149,23 @@
+ 	$(CC) $(CFLAGS) -o $@ $? $(LIBS)
+ 
+ from_local: from_local.c
+-	cc $(CFLAGS) -DTEST -o $@ from_local.c
++	$(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c
+ 
+ get_myaddress: get_myaddress.c
+-	cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS)
++	$(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS)
+ 
+ install: all
+-	install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin
+-	install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin
+-	install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin
+-	install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8
+-	install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8
+-	install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8
+-	cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt
+-	gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt
++	install -d $(DESTDIR)/$(sbindir) \
++		   $(DESTDIR)/$(docdir) \
++		   $(DESTDIR)/$(mandir)/man8
++	install -m 0755 portmap ${DESTDIR}/sbin
++	install -m 0755 pmap_dump ${DESTDIR}/sbin
++	install -m 0755 pmap_set ${DESTDIR}/sbin
++	install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8
++	install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8
++	install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8
++	cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt
++	gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt
+ 
+ 
+ lint:	
+@@ -181,3 +191,6 @@
+ portmap.o: portmap.c
+ portmap.o: pmap_check.h Makefile
+ strerror.o: strerror.c
++
++%.o: %.c
++	$(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o
diff --git a/packages/portmap/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb
deleted file mode 100644
index ee6c648e9b..0000000000
--- a/packages/portmap/portmap-unslung_5-7.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "RPC program number mapper."
-SECTION = "console/network"
-LICENSE = "GPL"
-PR = "r2"
-COMPATIBLE_MACHINE = "nslu2"
-
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
-	file://no-libwrap.patch;patch=1;pnum=0 \
-	file://portmap.init \
-	file://make.patch;patch=1"
-S = "${WORKDIR}/portmap_5beta"
-
-sbindir = "/sbin"
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	oe_runmake 'docdir=${datadir}/doc/portmap' \
-		   'DESTDIR=${D}' install
-}
diff --git a/packages/portmap/portmap_5-7.bb b/packages/portmap/portmap.inc
index 0e6e2ab6a5..ad477828fb 100644
--- a/packages/portmap/portmap_5-7.bb
+++ b/packages/portmap/portmap.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r2"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
@@ -15,7 +14,7 @@ FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
 FILES_${PN}-doc += "${docdir}"
 
 INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . start 18 2 3 4 5 . stop 81 1 ."
+INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
 inherit update-rc.d
 
diff --git a/packages/portmap/portmap_5-24.bb b/packages/portmap/portmap_5-24.bb
new file mode 100644
index 0000000000..064679e7f0
--- /dev/null
+++ b/packages/portmap/portmap_5-24.bb
@@ -0,0 +1 @@
+require portmap.inc
diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb
index 76d66e9ad9..348a3060e4 100644
--- a/packages/portmap/portmap_5-9.bb
+++ b/packages/portmap/portmap_5-9.bb
@@ -1,33 +1,3 @@
-DESCRIPTION = "RPC program number mapper."
-SECTION = "console/network"
-LICENSE = "GPL"
-PR = "r5"
-
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
-	file://no-libwrap.patch;patch=1;pnum=0 \
-	file://portmap.init \
-	file://make.patch;patch=1"
-S = "${WORKDIR}/portmap_5beta"
-
-PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
-FILES_${PN}-doc += "${docdir}"
-
-INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
+require portmap.inc
 
-inherit update-rc.d
-
-sbindir = "/sbin"
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-	oe_runmake 'docdir=${docdir}/portmap' \
-		   'DESTDIR=${D}' install
-}
+PR = "r5"
diff --git a/packages/psplash/files/psplash-hand-img.h b/packages/psplash/files/psplash-hand-img.h
index 3e9a933ea8..c54f04c362 100644
--- a/packages/psplash/files/psplash-hand-img.h
+++ b/packages/psplash/files/psplash-hand-img.h
@@ -1,757 +1,1498 @@
 /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
 
-#define HAND_IMG_ROWSTRIDE (600)
-#define HAND_IMG_WIDTH (150)
-#define HAND_IMG_HEIGHT (93)
+#define HAND_IMG_ROWSTRIDE (880)
+#define HAND_IMG_WIDTH (220)
+#define HAND_IMG_HEIGHT (137)
 #define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
 #define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
-  "\261\377\377\377\0\1\0\0\0\12\271\377\377\377\0\1\0\0\0\13\333\377\377" \
-  "\377\0\1\0\0\0\15\271\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0" \
-  "\0\0\15\271\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\15\271" \
-  "\377\377\377\0\1\0\0\0\16\324\377\377\377\0\17\0\0\0\6\0\0\0!\7\10\11" \
-  ">\34\35\"h\"$*\214,.7\23568C\2538:F\2748:F\257/1:\241$&-\221\36\37%r" \
-  "\17\20\23I\0\0\0(\0\0\0\14\252\377\377\377\0\20\0\0\0\3\0\0\0\33\3\3" \
-  "\4;\31\32\36f\37\40'\220%'/\247.09\26468C\30179E\32278D\305,.7\262!!" \
-  "(\234\30\31\36m\0\0\0+\0\0\0\5\0\0\0\2\312\377\377\377\0\10\0\0\0\21" \
-  "\33\34!n24>\262KO^\331gl\201\360z\200\230\376\213\221\255\377\231\240" \
-  "\276\377\202\234\243\302\377\1\224\232\270\377\202\234\243\302\377\10" \
-  "\233\242\301\377\217\226\262\377\177\205\237\377mr\210\364TWh\3419;G" \
-  "\275\"#*\210\0\0\0!\244\377\377\377\0\11\0\0\0\7\34\35#d13<\267EHV\340" \
-  "Y]o\356nt\212\375\200\206\240\377\222\230\266\377\233\242\301\377\202" \
-  "\234\243\302\377\1\223\232\267\377\202\234\243\302\377\10\231\240\276" \
-  "\377\203\211\243\377bg{\362<>J\310\"$+\216\0\0\0#\0\0\0\15\0\0\0\5\304" \
-  "\377\377\377\0\5\0\0\0\34\40\"(\20479D\273TXi\342\212\221\254\377\210" \
-  "\234\243\302\377\1\224\232\270\377\210\234\243\302\377\5\223\232\267" \
-  "\377afy\354<>J\307%'.\231\11\11\13""6\236\377\377\377\0\6\0\0\0\5\27" \
-  "\30\34Y,.7\263GJY\336|\201\233\375\231\240\276\377\210\234\243\302\377" \
-  "\1\223\232\267\377\206\234\243\302\377\4\223\232\267\377]at\350:=H\270" \
-  "\33\34!d\202\0\0\0\16\1\0\0\0\7\277\377\377\377\0\4\0\0\0\31(*2\250Y" \
-  "]o\347\221\230\265\377\207\234\243\302\377\11\233\242\301\377\231\240" \
-  "\276\377\227\236\274\377\225\234\272\377\213\220\255\377\225\234\272" \
-  "\377\227\236\274\377\231\240\276\377\233\242\301\377\207\234\243\302" \
-  "\377\4\230\237\275\377kp\205\362-/8\300\22\23\27<\232\377\377\377\0\5" \
-  "\0\0\0\26)+4\247CFT\331x~\226\374\232\241\300\377\210\234\243\302\377" \
-  "\10\232\241\277\377\230\237\275\377\226\235\273\377\214\222\256\377\225" \
-  "\233\271\377\227\235\273\377\230\237\276\377\232\241\300\377\205\234" \
-  "\243\302\377\6u{\222\366,.7\276\20\21\24(\0\0\0\10\0\0\0\20\0\0\0\10" \
-  "\273\377\377\377\0\4\0\0\0\15$&-\225QUe\340\227\235\273\377\205\234\243" \
-  "\302\377\1\230\237\275\377\202\224\232\270\377\17\215\222\257\377TXi" \
-  "\351ACQ\3228:E\276,.7\251\36\37%\231(*2\24357B\267\77BN\315KM]\341\201" \
-  "\210\241\376\224\233\270\377\224\232\270\377\226\235\273\377\233\242" \
-  "\301\377\205\234\243\302\377\3fj~\355+,5\264\13\13\15%\226\377\377\377" \
-  "\0\5\0\0\0\1\37\40'xEHV\336\217\224\261\377\232\241\300\377\205\234\243" \
-  "\302\377\1\230\237\276\377\202\224\232\270\377\202\224\233\270\377\10" \
-  "\226\235\273\377\230\237\275\377\232\241\277\377\223\232\267\377\233" \
-  "\242\301\377\231\240\276\377\227\235\273\377\225\233\271\377\202\224" \
-  "\233\270\377\7\224\232\270\377\226\235\273\377\233\242\301\377\234\243" \
-  "\302\377\232\241\277\377W[l\345$&-\225\202\0\0\0\10\2\0\0\0\20\0\0\0" \
-  "\5\267\377\377\377\0\4\0\0\0\5!\")\200GJX\327\221\230\265\377\203\234" \
-  "\243\302\377\2\233\242\301\377\227\235\273\377\202\224\232\270\377\5" \
-  "\227\236\274\377\213\221\255\377GKY\331%'.\231\0\0\0\31\203\377\377\377" \
-  "\0\1\0\0\0\15\203\377\377\377\0\11\0\0\0\12\36\37%}:<H\316|\202\233\371" \
-  "\231\240\276\377\224\233\270\377\224\232\270\377\225\234\272\377\232" \
-  "\241\300\377\203\234\243\302\377\4\231\240\276\377Y]o\346)*3\243\0\0" \
-  "\0\24\223\377\377\377\0\4\21\22\25--/8\304y\177\227\371\232\241\277\377" \
-  "\204\234\243\302\377\1\227\236\274\377\202\224\232\270\377\1\227\235" \
-  "\273\377\205\234\243\302\377\26\233\242\301\377z\200\230\372DGU\335@" \
-  "CP\312<>J\27569D\26046@\25069C\2578;F\270;>I\300>AN\321ORb\347qv\215" \
-  "\374\215\224\260\377\232\241\300\377\215\224\260\377&(0\270\0\0\0\1\377" \
-  "\377\377\0\0\0\0\12\0\0\0\17\0\0\0\3\264\377\377\377\0\3\11\11\13\36" \
-  "24\77\310\212\220\253\375\204\234\243\302\377\10\225\234\272\377\224" \
-  "\232\270\377\230\237\276\377\234\243\302\377\227\235\273\377CFT\327#" \
-  "%,}\0\0\0\11\205\377\377\377\0\1\0\0\0\15\205\377\377\377\0\6\0\0\0\2" \
-  "\33\34!`47A\310\212\220\254\375\234\243\302\377\232\241\277\377\202\224" \
-  "\233\270\377\1\233\242\301\377\203\234\243\302\377\3\225\233\271\377" \
-  "GJX\335\40!(M\220\377\377\377\0\4\0\0\0\7$&-\223UYj\350\227\236\275\377" \
-  "\204\234\243\302\377\3\226\235\273\377\224\232\270\377\230\237\275\377" \
-  "\205\234\243\302\377\6\227\235\273\377ko\205\362@CP\316*+4\246\22\23" \
-  "\27O\0\0\0\24\210\377\377\377\0\7\0\0\0\16\14\15\17A\40!(\206/2<\267" \
-  "HKY\337gl\200\372%'/\214\202\377\377\377\0\3\0\0\0\1\0\0\0\15\0\0\0\11" \
-  "\262\377\377\377\0\3\32\33\40EDGU\331\232\241\277\377\203\234\243\302" \
-  "\377\3\227\235\273\377\223\232\267\377\231\240\276\377\202\234\243\302" \
-  "\377\3\212\220\254\375+-6\304\5\5\7\31\207\377\377\377\0\1\0\0\0\15\207" \
-  "\377\377\377\0\3\0\0\0\3&(0\234ty\220\361\202\234\243\302\377\4\232\241" \
-  "\300\377\224\233\270\377\225\233\271\377\233\242\301\377\203\234\243" \
-  "\302\377\2afy\352#%,{\216\377\377\377\0\4\0\0\0\23""02<\310\205\213\246" \
-  "\376\233\242\301\377\203\234\243\302\377\3\227\236\274\377\223\232\267" \
-  "\377\230\237\276\377\205\234\243\302\377\4ot\212\360<>J\302%'.\222\10" \
-  "\10\12.\203\377\377\377\0\1\0\0\0\16\214\377\377\377\0\4\0\0\0\13\25" \
-  "\27\33i\26\30\35\277\6\6\10\25\203\377\377\377\0\2\0\0\0\10\0\0\0\15" \
-  "\260\377\377\377\0\2\37!'r\\`s\346\203\234\243\302\377\3\230\237\275" \
-  "\377\223\232\267\377\230\237\275\377\203\234\243\302\377\3ty\221\362" \
-  "%&.\237\0\0\0\4\210\377\377\377\0\1\0\0\0\15\211\377\377\377\0\2\40\"" \
-  ")iX\\n\341\203\234\243\302\377\3\232\241\277\377\223\232\267\377\225" \
-  "\234\272\377\203\234\243\302\377\3y~\226\366&(0\245\0\0\0\4\213\377\377" \
-  "\377\0\3\0\0\0\25""24\77\316\217\226\263\377\203\234\243\302\377\3\231" \
-  "\240\276\377\223\232\267\377\227\236\274\377\205\234\243\302\377\3\212" \
-  "\221\254\3769<G\315\32\33\40L\206\377\377\377\0\1\0\0\0\16\216\377\377" \
-  "\377\0\3\0\0\0\2\0\0\0\15\0\0\0\13\203\377\377\377\0\3\0\0\0\5\0\0\0" \
-  "\20\0\0\0\1\254\377\377\377\0\3\0\0\0\3#$+\234uz\221\362\203\234\243" \
-  "\302\377\2\225\234\272\377\226\235\273\377\204\234\243\302\377\2ot\212" \
-  "\357\40!(p\212\377\377\377\0\1\0\0\0\15\212\377\377\377\0\2\25\26\32" \
-  "6LP_\331\204\234\243\302\377\3\230\237\276\377\223\232\267\377\233\242" \
-  "\301\377\202\234\243\302\377\3\213\221\255\376-/8\302\0\0\0\23\211\377" \
-  "\377\377\0\3\5\6\7\30""13=\320\222\231\266\377\203\234\243\302\377\2" \
-  "\227\235\273\377\225\233\271\377\205\234\243\302\377\4\231\240\276\377" \
-  "SVg\343$%-\214\0\0\0\5\207\377\377\377\0\1\0\0\0\16\220\377\377\377\0" \
-  "\3\0\0\0\4\0\0\0\16\0\0\0\1\202\377\377\377\0\3\0\0\0\2\0\0\0\20\0\0" \
-  "\0\3\253\377\377\377\0\2%'.\256\210\216\252\373\203\234\243\302\377\2" \
-  "\224\232\270\377\230\237\275\377\204\234\243\302\377\2\203\211\243\372" \
-  "$&-\215\213\377\377\377\0\1\0\0\0\15\213\377\377\377\0\2\32\33\40Lcg" \
-  "{\346\204\234\243\302\377\3\232\241\300\377\222\231\266\377\232\241\300" \
-  "\377\202\234\243\302\377\3\226\235\273\37747A\321\0\0\0\20\207\377\377" \
-  "\377\0\3\5\5\6\32""24>\322\225\233\272\377\203\234\243\302\377\2\225" \
-  "\233\271\377\227\236\274\377\205\234\243\302\377\3ty\220\365,.7\273\14" \
-  "\14\17\"\211\377\377\377\0\1\0\0\0\16\221\377\377\377\0\3\0\0\0\1\0\0" \
-  "\0\16\0\0\0\3\203\377\377\377\0\2\0\0\0\20\0\0\0\3\251\377\377\377\0" \
-  "\2!#)\214\202\210\241\370\202\234\243\302\377\3\232\241\300\377\223\232" \
-  "\267\377\232\241\277\377\204\234\243\302\377\2\222\230\265\377)*3\261" \
-  "\214\377\377\377\0\1\0\0\0\15\214\377\377\377\0\2!\")ux~\226\363\205" \
-  "\234\243\302\377\2\223\232\267\377\230\237\276\377\202\234\243\302\377" \
-  "\3\225\233\271\377+-6\277\0\0\0\3\205\377\377\377\0\3\5\5\6\33""36@\322" \
-  "\223\232\270\377\202\234\243\302\377\3\233\242\301\377\223\232\267\377" \
-  "\231\240\276\377\205\234\243\302\377\2VZk\344\35\36$c\213\377\377\377" \
-  "\0\1\0\0\0\16\223\377\377\377\0\2\0\0\0\14\0\0\0\6\203\377\377\377\0" \
-  "\2\0\0\0\20\0\0\0\1\247\377\377\377\0\2\35\36$`lq\206\354\202\234\243" \
-  "\302\377\3\232\241\277\377\223\232\267\377\233\242\301\377\204\234\243" \
-  "\302\377\3\232\241\277\37725\77\310\0\0\0\11\214\377\377\377\0\1\0\0" \
-  "\0\15\215\377\377\377\0\2%'.\235\212\220\254\374\205\234\243\302\377" \
-  "\2\225\234\272\377\227\236\274\377\202\234\243\302\377\2\212\220\253" \
-  "\375%'/\240\205\377\377\377\0\2)+4\277\222\230\266\377\202\234\243\302" \
-  "\377\3\232\241\300\377\223\232\267\377\232\241\300\377\205\234\243\302" \
-  "\377\2W[l\344\36\37%Q\214\377\377\377\0\1\0\0\0\16\224\377\377\377\0" \
-  "\202\0\0\0\11\202\377\377\377\0\2\0\0\0\2\0\0\0\17\246\377\377\377\0" \
-  "\2\23\23\27""6TWh\337\202\234\243\302\377\2\233\242\301\377\223\232\267" \
-  "\377\206\234\243\302\377\2Y]o\346\16\17\22$\214\377\377\377\0\3\0\0\0" \
-  "\1\0\0\0\20\0\0\0\1\214\377\377\377\0\2\0\0\0\3""9;G\311\206\234\243" \
-  "\302\377\2\225\233\271\377\231\240\276\377\202\234\243\302\377\2w|\224" \
-  "\364\"$+v\203\377\377\377\0\2\36\37%|x~\226\370\203\234\243\302\377\2" \
-  "\223\232\267\377\233\242\301\377\205\234\243\302\377\2X\\n\343\36\37" \
-  "%Q\215\377\377\377\0\2\0\0\0\21\0\0\0\1\224\377\377\377\0\2\0\0\0\11" \
-  "\0\0\0\6\202\377\377\377\0\2\0\0\0\5\0\0\0\15\244\377\377\377\0\2\0\0" \
-  "\0\26=@L\322\203\234\243\302\377\2\223\232\267\377\233\242\301\377\205" \
-  "\234\243\302\377\2\222\231\266\377')1\233\210\377\377\377\0\3\0\0\0\3" \
-  "\0\0\0\14\0\0\0\16\203\0\0\0\15\2\0\0\0\26\0\0\0\14\202\0\0\0\15\3\0" \
-  "\0\0\16\0\0\0\15\0\0\0\5\210\377\377\377\0\2\30\31\36Vv{\222\363\206" \
-  "\234\243\302\377\2\223\232\267\377\232\241\300\377\202\234\243\302\377" \
-  "\5`ex\347\35\36$J\377\377\377\0\12\12\15%JN\\\342\203\234\243\302\377" \
-  "\2\224\232\270\377\232\241\277\377\205\234\243\302\377\2Y]o\343\36\37" \
-  "%Q\210\377\377\377\0\3\0\0\0\2\0\0\0\13\0\0\0\16\203\0\0\0\15\2\0\0\0" \
-  "\27\0\0\0\14\202\0\0\0\15\3\0\0\0\16\0\0\0\15\0\0\0\6\220\377\377\377" \
-  "\0\2\0\0\0\14\0\0\0\3\202\377\377\377\0\2\0\0\0\10\0\0\0\11\243\377\377" \
-  "\377\0\2,.7\265\230\237\275\377\202\234\243\302\377\2\225\233\271\377" \
-  "\231\240\276\377\206\234\243\302\377\2GKY\327\0\0\0\16\205\377\377\377" \
-  "\0\5\0\0\0\1\0\0\0\13\0\0\0\16\0\0\0\13\0\0\0\2\204\377\377\377\0\1\0" \
-  "\0\0\15\204\377\377\377\0\5\0\0\0\1\0\0\0\11\0\0\0\16\0\0\0\15\0\0\0" \
-  "\2\206\377\377\377\0\2.1:\272\233\242\301\377\205\234\243\302\377\2\233" \
-  "\242\301\377\223\232\267\377\203\234\243\302\377\4BDR\327\0\0\0\16*," \
-  "4\304\230\237\275\377\202\234\243\302\377\2\225\234\272\377\230\237\275" \
-  "\377\205\234\243\302\377\2Z^p\343\36\37%Q\207\377\377\377\0\4\0\0\0\12" \
-  "\0\0\0\16\0\0\0\14\0\0\0\3\204\377\377\377\0\1\0\0\0\16\204\377\377\377" \
-  "\0\2\0\0\0\1\0\0\0\10\202\0\0\0\16\1\0\0\0\3\216\377\377\377\0\2\0\0" \
-  "\0\16\0\0\0\1\202\377\377\377\0\2\0\0\0\15\0\0\0\3\241\377\377\377\0" \
-  "\2\25\26\32Kqv\215\360\202\234\243\302\377\2\227\235\273\377\227\236" \
-  "\274\377\206\234\243\302\377\2\207\215\250\374\37!'z\205\377\377\377" \
-  "\0\3\0\0\0\11\0\0\0\16\0\0\0\3\207\377\377\377\0\1\0\0\0\15\207\377\377" \
-  "\377\0\4\0\0\0\1\0\0\0\15\0\0\0\14\0\0\0\1\204\377\377\377\0\2\20\20" \
-  "\24""0aey\350\206\234\243\302\377\2\232\241\300\377\224\232\270\377\202" \
-  "\234\243\302\377\3\221\230\265\377!#(\313}\202\233\372\202\234\243\302" \
-  "\377\2\230\237\275\377\226\235\273\377\205\234\243\302\377\2{\200\231" \
-  "\366\37\40'h\206\377\377\377\0\3\0\0\0\10\0\0\0\16\0\0\0\4\207\377\377" \
-  "\377\0\1\0\0\0\16\207\377\377\377\0\4\0\0\0\1\0\0\0\14\0\0\0\15\0\0\0" \
-  "\2\214\377\377\377\0\2\0\0\0\1\0\0\0\16\202\377\377\377\0\2\0\0\0\1\0" \
-  "\0\0\17\240\377\377\377\0\2\0\0\0\1""47A\303\202\234\243\302\377\2\232" \
-  "\241\300\377\224\233\270\377\207\234\243\302\377\2>AN\312\0\0\0\3\203" \
-  "\377\377\377\0\3\0\0\0\4\0\0\0\17\0\0\0\5\211\377\377\377\0\1\0\0\0\15" \
-  "\211\377\377\377\0\3\0\0\0\2\0\0\0\16\0\0\0\10\204\377\377\377\0\2+-" \
-  "5\252\232\241\300\377\206\234\243\302\377\5\230\237\275\377\227\236\274" \
-  "\377\234\243\302\377\224\232\270\377HLZ\373\202\234\243\302\377\2\233" \
-  "\242\301\377\224\232\270\377\205\234\243\302\377\2\231\240\276\377.0" \
-  "9\270\205\377\377\377\0\3\0\0\0\2\0\0\0\17\0\0\0\6\211\377\377\377\0" \
-  "\1\0\0\0\16\211\377\377\377\0\3\0\0\0\2\0\0\0\15\0\0\0\11\214\377\377" \
-  "\377\0\2\0\0\0\4\0\0\0\11\202\377\377\377\0\2\0\0\0\13\0\0\0\5\237\377" \
-  "\377\377\0\2\33\34\"f\177\204\235\370\202\234\243\302\377\2\224\232\270" \
-  "\377\233\242\301\377\206\234\243\302\377\2\225\233\271\377#$+\216\203" \
-  "\377\377\377\0\2\0\0\0\7\0\0\0\16\213\377\377\377\0\1\0\0\0\15\213\377" \
-  "\377\377\0\2\0\0\0\12\0\0\0\14\203\377\377\377\0\2\20\21\24;pu\213\364" \
-  "\207\234\243\302\377\4\224\232\270\377\234\243\302\377Z^p\377\213\221" \
-  "\255\377\202\234\243\302\377\2\224\233\270\377\232\241\300\377\205\234" \
-  "\243\302\377\2QUe\340\11\11\13\37\204\377\377\377\0\6\0\0\0\5\24\26\31" \
-  "\214),4\261&'.\234\27\32\35W\0\0\0\3\207\377\377\377\0\1\0\0\0\16\213" \
-  "\377\377\377\0\2\0\0\0\10\0\0\0\15\214\377\377\377\0\2\0\0\0\14\0\0\0" \
-  "\1\202\377\377\377\0\1\0\0\0\20\236\377\377\377\0\2\0\0\0\5=@L\315\202" \
-  "\234\243\302\377\2\231\240\276\377\225\234\272\377\207\234\243\302\377" \
-  "\2]bt\347\0\0\0\36\202\377\377\377\0\202\0\0\0\12\214\377\377\377\0\1" \
-  "\0\0\0\15\214\377\377\377\0\2\0\0\0\6\0\0\0\17\203\377\377\377\0\1=@" \
-  "M\312\207\234\243\302\377\3\231\240\276\377\223\232\267\377LP_\377\202" \
-  "\234\243\302\377\2\232\241\300\377\224\233\270\377\205\234\243\302\377" \
-  "\2\205\213\246\373!#)\177\204\377\377\377\0\11\0\0\0\10\0\0\0\14\0\0" \
-  "\0\15(+3\263}\204\235\370{\200\231\371BER\323')0\226\0\0\0\13\205\377" \
-  "\377\377\0\1\0\0\0\16\214\377\377\377\0\3\0\0\0\4\0\0\0\17\0\0\0\1\212" \
-  "\377\377\377\0\2\0\0\0\2\0\0\0\13\202\377\377\377\0\2\0\0\0\11\0\0\0" \
-  "\7\235\377\377\377\0\2!\")~\211\217\253\375\202\234\243\302\377\1\223" \
-  "\232\267\377\210\234\243\302\377\1""57B\273\202\377\377\377\0\2\0\0\0" \
-  "\11\0\0\0\10\215\377\377\377\0\1\0\0\0\15\215\377\377\377\0\2\0\0\0\4" \
-  "\0\0\0\16\202\377\377\377\0\2$&-\220\224\233\270\377\207\234\243\302" \
-  "\377\2_dw\377|\202\234\377\202\234\243\302\377\2\224\232\270\377\233" \
-  "\242\301\377\205\234\243\302\377\2""13=\306\0\0\0\2\203\377\377\377\0" \
-  "\2\0\0\0\7\0\0\0\12\203\377\377\377\0\6!#+\202ty\220\361\234\243\302" \
-  "\377\222\230\265\377\77BN\322\34\37\"R\204\377\377\377\0\1\0\0\0\16\215" \
-  "\377\377\377\0\2\0\0\0\2\0\0\0\17\213\377\377\377\0\2\0\0\0\14\0\0\0" \
-  "\2\202\377\377\377\0\1\0\0\0\20\235\377\377\377\0\1<\77K\313\202\234" \
-  "\243\302\377\2\230\237\275\377\227\235\273\377\207\234\243\302\377\5" \
-  "\210\217\252\376\34\35\"o\377\377\377\0\0\0\0\5\0\0\0\14\216\377\377" \
-  "\377\0\1\0\0\0\15\216\377\377\377\0\5\0\0\0\7\0\0\0\12\377\377\377\0" \
-  "\0\0\0\35]bt\351\207\234\243\302\377\5HKZ\377\225\233\271\377\234\243" \
-  "\302\377\231\240\276\377\225\234\272\377\205\234\243\302\377\2aex\351" \
-  "\23\24\30""4\203\377\377\377\0\2\0\0\0\4\0\0\0\16\205\377\377\377\0\2" \
-  "%'.\221\204\212\244\372\202\234\243\302\377\2lq\206\357!$,z\203\377\377" \
-  "\377\0\1\0\0\0\16\216\377\377\377\0\2\0\0\0\4\0\0\0\15\212\377\377\377" \
-  "\0\2\0\0\0\1\0\0\0\15\202\377\377\377\0\2\0\0\0\11\0\0\0\6\233\377\377" \
-  "\377\0\2\6\6\10)ej~\357\202\234\243\302\377\1\224\232\270\377\210\234" \
-  "\243\302\377\4NRa\336\0\0\0\12\0\0\0\2\0\0\0\17\217\377\377\377\0\1\0" \
-  "\0\0\15\217\377\377\377\0\4\0\0\0\12\0\0\0\7\377\377\377\0""79D\300\206" \
-  "\234\243\302\377\5y~\226\377hm\202\377\224\232\270\377\234\243\302\377" \
-  "\224\232\270\377\206\234\243\302\377\1""58B\271\203\377\377\377\0\2\0" \
-  "\0\0\1\0\0\0\20\207\377\377\377\0\2*+2\262\226\235\272\377\202\234\243" \
-  "\302\377\2rv\215\357\"\"(y\202\377\377\377\0\1\0\0\0\16\217\377\377\377" \
-  "\0\2\0\0\0\10\0\0\0\11\212\377\377\377\0\5\0\0\0\14\0\0\0\2\377\377\377" \
-  "\0\0\0\0\1\0\0\0\15\233\377\377\377\0\5#%,\217\225\233\271\377\234\243" \
-  "\302\377\233\242\301\377\224\233\270\377\210\234\243\302\377\4;>J\300" \
-  "\377\377\377\0\0\0\0\16\0\0\0\1\217\377\377\377\0\1\0\0\0\15\220\377" \
-  "\377\377\0\4\0\0\0\17\377\377\377\0%'.\236\232\241\277\377\205\234\243" \
-  "\302\377\5MQa\377\227\236\273\377\230\237\275\377\227\236\274\377\224" \
-  "\232\270\377\205\234\243\302\377\2\206\214\247\376\35\36$j\203\377\377" \
-  "\377\0\2\0\0\0\15\0\0\0\2\207\377\377\377\0\2\0\0\0\27SWh\342\203\234" \
-  "\243\302\377\4bh{\352\21\21\26;\377\377\377\0\0\0\0\16\220\377\377\377" \
-  "\0\2\0\0\0\16\0\0\0\1\211\377\377\377\0\2\0\0\0\3\0\0\0\12\202\377\377" \
-  "\377\0\1\0\0\0\16\233\377\377\377\0\1:=H\302\202\234\243\302\377\2\227" \
-  "\235\273\377\231\240\276\377\210\234\243\302\377\3+-5\242\0\0\0\4\0\0" \
-  "\0\12\220\377\377\377\0\1\0\0\0\15\220\377\377\377\0\4\0\0\0\4\0\0\0" \
-  "\13\26\27\34X\200\206\237\376\205\234\243\302\377\1KN]\377\202\234\243" \
-  "\302\377\2\220\226\263\377\227\236\274\377\205\234\243\302\377\2KO^\333" \
-  "\0\0\0\11\202\377\377\377\0\2\0\0\0\3\0\0\0\15\211\377\377\377\0\2)+" \
-  "4\242\226\235\273\377\203\234\243\302\377\3.1:\301\377\377\377\0\0\0" \
-  "\0\16\220\377\377\377\0\2\0\0\0\2\0\0\0\15\212\377\377\377\0\1\0\0\0" \
-  "\15\202\377\377\377\0\2\0\0\0\12\0\0\0\4\231\377\377\377\0\2\0\0\0\31" \
-  "\\`r\350\202\234\243\302\377\1\224\232\270\377\210\234\243\302\377\3" \
-  "\213\221\255\377\33\34!l\0\0\0\17\221\377\377\377\0\1\0\0\0\15\221\377" \
-  "\377\377\0\3\0\0\0\16\0\0\0\25Y]o\350\204\234\243\302\377\2\221\230\265" \
-  "\377VZk\377\202\234\243\302\377\1\215\223\257\377\206\234\243\302\377" \
-  "\1.09\255\203\377\377\377\0\2\0\0\0\17\0\0\0\1\211\377\377\377\0\2\12" \
-  "\12\12\32UXi\344\203\234\243\302\377\3|\200\231\365\31\34!f\0\0\0\16" \
-  "\221\377\377\377\0\2\0\0\0\15\0\0\0\2\211\377\377\377\0\5\0\0\0\14\0" \
-  "\0\0\1\377\377\377\0\0\0\0\2\0\0\0\14\231\377\377\377\0\2\40!'}\217\226" \
-  "\262\377\202\234\243\302\377\1\224\232\270\377\210\234\243\302\377\3" \
-  "gk\200\357\0\0\0&\0\0\0\12\221\377\377\377\0\1\0\0\0\15\221\377\377\377" \
-  "\0\3\0\0\0\3\0\0\0\14BER\315\204\234\243\302\377\2hm\201\377\177\205" \
-  "\236\377\202\234\243\302\377\2\217\225\262\377\230\237\276\377\204\234" \
-  "\243\302\377\2v|\223\370\25\26\33J\202\377\377\377\0\2\0\0\0\2\0\0\0" \
-  "\15\213\377\377\377\0\2)+4\246\226\235\273\377\203\234\243\302\377\2" \
-  ";>I\317\0\0\0\26\221\377\377\377\0\2\0\0\0\1\0\0\0\16\211\377\377\377" \
-  "\0\2\0\0\0\4\0\0\0\10\202\377\377\377\0\1\0\0\0\16\231\377\377\377\0" \
-  "\1""36@\262\202\234\243\302\377\2\227\236\274\377\230\237\275\377\210" \
-  "\234\243\302\377\3GJX\324\0\0\0\15\0\0\0\1\221\377\377\377\0\1\0\0\0" \
-  "\15\222\377\377\377\0\2\0\0\0\17""36@\256\204\234\243\302\377\1OSb\377" \
-  "\202\234\243\302\377\3\231\240\276\377\226\235\273\377\224\233\270\377" \
-  "\204\234\243\302\377\2BER\321\0\0\0\1\202\377\377\377\0\2\0\0\0\13\0" \
-  "\0\0\3\213\377\377\377\0\2\11\11\21\36_cv\353\203\234\243\302\377\2\214" \
-  "\222\255\375\35\35#\221\222\377\377\377\0\1\0\0\0\16\212\377\377\377" \
-  "\0\1\0\0\0\15\202\377\377\377\0\2\0\0\0\15\0\0\0\1\230\377\377\377\0" \
-  "\1;>J\303\202\234\243\302\377\1\224\233\270\377\211\234\243\302\377\2" \
-  ":=I\301\0\0\0\16\222\377\377\377\0\1\0\0\0\15\222\377\377\377\0\2\0\0" \
-  "\0\14\"#*\233\204\234\243\302\377\1NRb\377\202\234\243\302\377\3\225" \
-  "\234\272\377\232\241\300\377\224\233\270\377\204\234\243\302\377\1""7" \
-  ":E\261\203\377\377\377\0\1\0\0\0\16\215\377\377\377\0\1EHU\313\204\234" \
-  "\243\302\377\2:>I\324\0\0\0\1\221\377\377\377\0\2\0\0\0\11\0\0\0\4\211" \
-  "\377\377\377\0\1\0\0\0\14\202\377\377\377\0\2\0\0\0\12\0\0\0\3\230\377" \
-  "\377\377\0\1ADR\320\202\234\243\302\377\1\224\233\270\377\211\234\243" \
-  "\302\377\2""46@\267\0\0\0\13\222\377\377\377\0\1\0\0\0\15\222\377\377" \
-  "\377\0\3\0\0\0\3\34\35#\216\227\236\274\377\203\234\243\302\377\1MQ`" \
-  "\377\202\234\243\302\377\3\224\233\270\377\234\243\302\377\224\233\270" \
-  "\377\204\234\243\302\377\1,.7\237\202\377\377\377\0\2\0\0\0\1\0\0\0\15" \
-  "\215\377\377\377\0\1""36A\252\204\234\243\302\377\2gk\200\364\12\12\12" \
-  "3\221\377\377\377\0\2\0\0\0\1\0\0\0\14\211\377\377\377\0\1\0\0\0\14\202" \
-  "\377\377\377\0\2\0\0\0\7\0\0\0\6\230\377\377\377\0\1HKY\335\202\234\243" \
-  "\302\377\1\224\233\270\377\211\234\243\302\377\2,.7\260\0\0\0\4\222\377" \
-  "\377\377\0\1\0\0\0\15\223\377\377\377\0\2\27\30\36x\215\223\257\377\202" \
-  "\234\243\302\377\2\232\241\300\377OSb\377\202\234\243\302\377\3\224\233" \
-  "\270\377\234\243\302\377\224\233\270\377\203\234\243\302\377\2\227\235" \
-  "\273\377!#)\206\202\377\377\377\0\202\0\0\0\7\215\377\377\377\0\2!#)" \
-  "|\222\230\265\377\203\234\243\302\377\2\215\224\260\377$$+\216\222\377" \
-  "\377\377\0\1\0\0\0\16\211\377\377\377\0\1\0\0\0\14\202\377\377\377\0" \
-  "\2\0\0\0\4\0\0\0\12\227\377\377\377\0\2\0\0\0\23X\\m\351\202\234\243" \
-  "\302\377\1\224\233\270\377\211\234\243\302\377\2&&/\247\0\0\0\1\222\377" \
-  "\377\377\0\1\0\0\0\15\223\377\377\377\0\2\17\20\23\\\202\210\242\377" \
-  "\202\234\243\302\377\2\216\224\261\377Z^q\377\202\234\243\302\377\3\224" \
-  "\233\270\377\234\243\302\377\224\233\270\377\203\234\243\302\377\2\204" \
-  "\212\244\377\26\27\33U\202\377\377\377\0\2\0\0\0\12\0\0\0\3\215\377\377" \
-  "\377\0\2\5\5\5/nt\211\365\203\234\243\302\377\2\223\232\267\37734>\260" \
-  "\222\377\377\377\0\1\0\0\0\16\211\377\377\377\0\5\0\0\0\11\0\0\0\3\377" \
-  "\377\377\0\0\0\0\1\0\0\0\14\227\377\377\377\0\2\0\0\0-lq\207\367\202" \
-  "\234\243\302\377\1\224\233\270\377\211\234\243\302\377\1\37\40&\236\223" \
-  "\377\377\377\0\1\0\0\0\15\223\377\377\377\0\2\0\0\0Aw|\224\375\202\234" \
-  "\243\302\377\2~\203\235\377hm\202\377\202\234\243\302\377\4\224\233\270" \
-  "\377\234\243\302\377\226\235\273\377\232\241\277\377\202\234\243\302" \
-  "\377\2lp\206\372\0\0\0(\202\377\377\377\0\2\0\0\0\15\0\0\0\1\215\377" \
-  "\377\377\0\2\0\0\0\27[^q\346\203\234\243\302\377\2\223\232\267\377<=" \
-  "J\273\222\377\377\377\0\1\0\0\0\16\211\377\377\377\0\202\0\0\0\6\202" \
-  "\377\377\377\0\1\0\0\0\15\221\377\377\377\0\206\0\0\0\2\2\22\23\27Q}" \
-  "\201\232\377\202\232\241\300\377\1\222\231\266\377\210\232\241\300\377" \
-  "\2\222\231\266\377\32\33\40\214\223\0\0\0\2\1\0\0\0\17\223\0\0\0\2\2" \
-  "\0\0\0""2in\202\361\202\232\241\300\377\2mr\210\377w|\223\377\202\232" \
-  "\241\300\377\2\222\231\266\377\232\241\300\377\202\226\235\273\377\202" \
-  "\232\241\300\377\2QTd\364\0\0\0\12\202\0\0\0\2\1\0\0\0\17\216\0\0\0\2" \
-  "\2\0\0\0\6JN\\\336\203\232\241\300\377\2\221\230\265\377BER\307\222\0" \
-  "\0\0\2\1\0\0\0\20\211\0\0\0\2\2\0\0\0\5\0\0\0\13\202\0\0\0\2\1\0\0\0" \
-  "\17\207\0\0\0\2\1\0\0\0\1\211\377\377\377\0\1\0\0\0\12\205\0\0\0\14\2" \
-  "\26\26\33f|\202\233\377\202\224\233\270\377\1\215\223\257\377\210\224" \
-  "\233\270\377\2\211\217\253\377\26\30\34\210\223\0\0\0\14\1\0\0\0\30\223" \
-  "\0\0\0\14\2\0\0\0""5`dw\356\202\224\233\270\377\2hm\202\377sx\216\377" \
-  "\202\224\233\270\377\4\215\223\257\377\224\233\270\377\221\227\264\377" \
-  "\220\227\263\377\202\224\233\270\377\2FIW\363\0\0\0\15\202\0\0\0\14\1" \
-  "\0\0\0\30\217\0\0\0\14\1DFU\336\203\224\233\270\377\2\213\222\255\377" \
-  "@CP\314\222\0\0\0\14\2\0\0\0\30\0\0\0\15\210\0\0\0\14\2\0\0\0\16\0\0" \
-  "\0\26\202\0\0\0\14\1\0\0\0\30\207\0\0\0\14\1\0\0\0\12\217\377\377\377" \
-  "\0\2\4\4\5""8sx\217\374\202\234\243\302\377\1\224\233\270\377\210\234" \
-  "\243\302\377\2\232\241\300\377\35\36#\231\223\377\377\377\0\1\0\0\0\15" \
-  "\223\377\377\377\0\2\0\0\0;sx\217\370\202\234\243\302\377\2}\201\233" \
-  "\377lp\205\377\202\234\243\302\377\4\224\233\270\377\234\243\302\377" \
-  "\227\235\273\377\231\240\276\377\202\234\243\302\377\2_cv\366\0\0\0\31" \
-  "\202\377\377\377\0\1\0\0\0\15\216\377\377\377\0\2\0\0\0\12TXg\343\203" \
-  "\234\243\302\377\2\223\232\267\377=@L\277\222\377\377\377\0\1\0\0\0\16" \
-  "\211\377\377\377\0\2\0\0\0\5\0\0\0\7\202\377\377\377\0\1\0\0\0\15\227" \
-  "\377\377\377\0\2\0\0\0\34_cv\355\202\234\243\302\377\1\224\233\270\377" \
-  "\211\234\243\302\377\1\"$+\244\223\377\377\377\0\1\0\0\0\15\223\377\377" \
-  "\377\0\2\11\11\12R~\204\235\377\202\234\243\302\377\2\213\222\255\377" \
-  "^bu\377\202\234\243\302\377\4\224\233\270\377\234\243\302\377\225\233" \
-  "\271\377\233\242\301\377\202\234\243\302\377\2z\200\230\376\13\13\16" \
-  "@\202\377\377\377\0\2\0\0\0\13\0\0\0\2\215\377\377\377\0\2\0\0\0\35d" \
-  "i|\354\203\234\243\302\377\2\223\232\267\37768B\265\222\377\377\377\0" \
-  "\1\0\0\0\16\211\377\377\377\0\2\0\0\0\10\0\0\0\4\202\377\377\377\0\1" \
-  "\0\0\0\15\227\377\377\377\0\2\0\0\0\4KO^\342\202\234\243\302\377\1\224" \
-  "\233\270\377\211\234\243\302\377\2*,4\255\0\0\0\3\222\377\377\377\0\1" \
-  "\0\0\0\15\223\377\377\377\0\2\25\26\33n\211\217\253\377\202\234\243\302" \
-  "\377\2\231\240\276\377SVg\377\202\234\243\302\377\3\224\233\270\377\234" \
-  "\243\302\377\224\233\270\377\203\234\243\302\377\2\217\226\262\377\37" \
-  "\40&u\202\377\377\377\0\2\0\0\0\10\0\0\0\5\215\377\377\377\0\2\30\30" \
-  "\36^\206\214\247\377\203\234\243\302\377\2\223\232\267\377+,6\241\222" \
-  "\377\377\377\0\1\0\0\0\16\211\377\377\377\0\5\0\0\0\13\0\0\0\1\377\377" \
-  "\377\0\0\0\0\3\0\0\0\13\230\377\377\377\0\1CFT\325\202\234\243\302\377" \
-  "\1\224\233\270\377\211\234\243\302\377\2""13=\265\0\0\0\10\222\377\377" \
-  "\377\0\1\0\0\0\15\222\377\377\377\0\3\0\0\0\1\33\34!\207\224\232\270" \
-  "\377\203\234\243\302\377\1QUe\377\202\234\243\302\377\3\224\233\270\377" \
-  "\234\243\302\377\224\233\270\377\204\234\243\302\377\1')1\231\202\377" \
-  "\377\377\0\2\0\0\0\3\0\0\0\12\215\377\377\377\0\1(+3\237\204\234\243" \
-  "\302\377\2|\202\232\376\26\31\34[\222\377\377\377\0\1\0\0\0\15\211\377" \
-  "\377\377\0\1\0\0\0\14\202\377\377\377\0\2\0\0\0\6\0\0\0\10\230\377\377" \
-  "\377\0\1=@L\310\202\234\243\302\377\1\224\233\270\377\211\234\243\302" \
-  "\377\2""8;F\275\0\0\0\16\222\377\377\377\0\1\0\0\0\15\222\377\377\377" \
-  "\0\2\0\0\0\11\37\40'\230\204\234\243\302\377\1PTd\377\202\234\243\302" \
-  "\377\3\225\233\271\377\233\242\301\377\224\233\270\377\204\234\243\302" \
-  "\377\1""36@\254\203\377\377\377\0\1\0\0\0\16\215\377\377\377\0\1:=H\275" \
-  "\204\234\243\302\377\2PSd\346\0\0\0\21\221\377\377\377\0\2\0\0\0\6\0" \
-  "\0\0\10\211\377\377\377\0\1\0\0\0\14\202\377\377\377\0\2\0\0\0\11\0\0" \
-  "\0\4\230\377\377\377\0\1""69C\272\202\234\243\302\377\2\225\234\272\377" \
-  "\232\241\277\377\210\234\243\302\377\2BES\313\0\0\0\15\222\377\377\377" \
-  "\0\1\0\0\0\15\222\377\377\377\0\2\0\0\0\16-/8\244\204\234\243\302\377" \
-  "\1NRb\377\202\234\243\302\377\3\227\236\274\377\230\237\275\377\224\233" \
-  "\270\377\204\234\243\302\377\1<>J\302\203\377\377\377\0\2\0\0\0\15\0" \
-  "\0\0\1\213\377\377\377\0\2\0\0\0\12LN^\333\204\234\243\302\377\1""03" \
-  "<\303\222\377\377\377\0\1\0\0\0\15\212\377\377\377\0\1\0\0\0\15\202\377" \
-  "\377\377\0\2\0\0\0\14\0\0\0\1\230\377\377\377\0\5'(0\230\230\237\276" \
-  "\377\234\243\302\377\232\241\300\377\225\233\271\377\210\234\243\302" \
-  "\377\3X\\n\345\0\0\0\27\0\0\0\5\221\377\377\377\0\1\0\0\0\15\222\377" \
-  "\377\377\0\2\0\0\0\16>@M\302\204\234\243\302\377\2`ex\377\207\215\251" \
-  "\377\202\234\243\302\377\2\221\227\264\377\227\235\273\377\204\234\243" \
-  "\302\377\2]as\351\0\0\0\37\202\377\377\377\0\2\0\0\0\5\0\0\0\11\213\377" \
-  "\377\377\0\2\37\37%\204\215\223\257\376\203\234\243\302\377\2\200\206" \
-  "\237\372\27\27\33i\222\377\377\377\0\1\0\0\0\16\211\377\377\377\0\2\0" \
-  "\0\0\2\0\0\0\13\202\377\377\377\0\1\0\0\0\16\231\377\377\377\0\2\13\13" \
-  "\16""7ot\212\364\202\234\243\302\377\1\224\233\270\377\210\234\243\302" \
-  "\377\3\177\205\236\375\22\23\27O\0\0\0\17\221\377\377\377\0\1\0\0\0\15" \
-  "\221\377\377\377\0\202\0\0\0\13\1NQa\337\204\234\243\302\377\2\213\221" \
-  "\255\377\\as\377\202\234\243\302\377\2\214\223\256\377\233\242\301\377" \
-  "\204\234\243\302\377\2\224\233\270\377$%,\223\203\377\377\377\0\1\0\0" \
-  "\0\20\212\377\377\377\0\2\0\0\0\11ADQ\323\204\234\243\302\377\2\77BN" \
-  "\316\0\0\0\20\221\377\377\377\0\2\0\0\0\10\0\0\0\7\211\377\377\377\0" \
-  "\2\0\0\0\12\0\0\0\3\202\377\377\377\0\1\0\0\0\16\232\377\377\377\0\1" \
-  "ADP\320\202\234\243\302\377\2\225\233\271\377\233\242\301\377\207\234" \
-  "\243\302\377\4\232\241\277\377%'/\225\0\0\0\11\0\0\0\6\220\377\377\377" \
-  "\0\1\0\0\0\15\220\377\377\377\0\4\0\0\0\1\0\0\0\16\12\12\14<ty\220\372" \
-  "\205\234\243\302\377\1LP_\377\202\234\243\302\377\2\216\224\261\377\231" \
-  "\240\276\377\205\234\243\302\377\1<\77K\315\203\377\377\377\0\2\0\0\0" \
-  "\7\0\0\0\11\211\377\377\377\0\2\36\40(\201\212\221\254\376\203\234\243" \
-  "\302\377\3sw\216\362\36\36$]\0\0\0\16\221\377\377\377\0\1\0\0\0\17\212" \
-  "\377\377\377\0\1\0\0\0\15\202\377\377\377\0\202\0\0\0\7\232\377\377\377" \
-  "\0\5)+4\247\233\242\301\377\234\243\302\377\232\241\277\377\225\234\272" \
-  "\377\210\234\243\302\377\3""79D\265\377\377\377\0\0\0\0\17\220\377\377" \
-  "\377\0\1\0\0\0\15\220\377\377\377\0\4\0\0\0\15\0\0\0\3!#*\213\224\233" \
-  "\270\377\205\234\243\302\377\5MQ`\377\233\242\301\377\232\241\277\377" \
-  "\224\233\271\377\224\233\270\377\205\234\243\302\377\2qv\215\365\22\23" \
-  "\26B\203\377\377\377\0\1\0\0\0\17\210\377\377\377\0\2\0\0\0\7\77AO\323" \
-  "\203\234\243\302\377\4\225\234\272\377*+4\254\377\377\377\0\0\0\0\16" \
-  "\220\377\377\377\0\2\0\0\0\13\0\0\0\4\211\377\377\377\0\2\0\0\0\1\0\0" \
-  "\0\14\202\377\377\377\0\1\0\0\0\16\233\377\377\377\0\2\23\24\27Ny\177" \
-  "\227\372\202\234\243\302\377\1\224\232\270\377\210\234\243\302\377\4" \
-  "DGU\323\377\377\377\0\0\0\0\6\0\0\0\12\217\377\377\377\0\1\0\0\0\15\217" \
-  "\377\377\377\0\4\0\0\0\4\0\0\0\14\377\377\377\0""02<\264\206\234\243" \
-  "\302\377\5lq\205\377u{\222\377\225\233\271\377\232\241\300\377\224\232" \
-  "\270\377\205\234\243\302\377\2\233\242\301\377+-6\253\203\377\377\377" \
-  "\0\2\0\0\0\4\0\0\0\14\207\377\377\377\0\2\40\"'\217\211\217\251\375\202" \
-  "\234\243\302\377\5\230\237\275\37758C\312\0\0\0\17\377\377\377\0\0\0" \
-  "\0\16\217\377\377\377\0\2\0\0\0\3\0\0\0\16\212\377\377\377\0\2\0\0\0" \
-  "\11\0\0\0\4\202\377\377\377\0\1\0\0\0\16\233\377\377\377\0\2\0\0\0\5" \
-  "EHV\330\202\234\243\302\377\2\225\234\272\377\231\240\276\377\207\234" \
-  "\243\302\377\5ty\220\366\21\22\25D\377\377\377\0\0\0\0\13\0\0\0\6\216" \
-  "\377\377\377\0\1\0\0\0\15\216\377\377\377\0\5\0\0\0\2\0\0\0\17\377\377" \
-  "\377\0\0\0\0\11KN]\332\206\234\243\302\377\6\232\241\300\377HKY\377\224" \
-  "\232\270\377\234\243\302\377\227\235\273\377\230\237\275\377\205\234" \
-  "\243\302\377\2ILZ\332\0\0\0\12\203\377\377\377\0\2\0\0\0\11\0\0\0\10" \
-  "\205\377\377\377\0\2\36!&fko\204\355\202\234\243\302\377\3\230\237\275" \
-  "\37778D\314\0\0\0\23\202\377\377\377\0\1\0\0\0\16\216\377\377\377\0\2" \
-  "\0\0\0\1\0\0\0\20\213\377\377\377\0\1\0\0\0\16\202\377\377\377\0\2\0" \
-  "\0\0\5\0\0\0\11\234\377\377\377\0\2*,4\247\227\236\274\377\202\234\243" \
-  "\302\377\1\223\232\267\377\207\234\243\302\377\2\233\242\301\377,.6\252" \
-  "\202\377\377\377\0\2\0\0\0\16\0\0\0\3\215\377\377\377\0\1\0\0\0\15\216" \
-  "\377\377\377\0\5\0\0\0\20\0\0\0\1\377\377\377\0\33\34\"k\207\215\250" \
-  "\376\207\234\243\302\377\2RVg\377\210\217\251\377\202\234\243\302\377" \
-  "\1\223\232\267\377\205\234\243\302\377\2\220\226\263\377')1\233\204\377" \
-  "\377\377\0\2\0\0\0\15\0\0\0\4\203\377\377\377\0\2\26\32\40PY]o\343\202" \
-  "\234\243\302\377\3x~\226\365-08\265\14\14\14\25\203\377\377\377\0\1\0" \
-  "\0\0\16\216\377\377\377\0\2\0\0\0\17\0\0\0\2\212\377\377\377\0\2\0\0" \
-  "\0\10\0\0\0\5\202\377\377\377\0\2\0\0\0\17\0\0\0\1\234\377\377\377\0" \
-  "\2\5\5\6\33TXi\341\202\234\243\302\377\2\227\235\273\377\230\237\275" \
-  "\377\207\234\243\302\377\2JM\\\331\0\0\0\11\202\377\377\377\0\2\0\0\0" \
-  "\17\0\0\0\4\214\377\377\377\0\1\0\0\0\15\214\377\377\377\0\3\0\0\0\1" \
-  "\0\0\0\20\0\0\0\3\202\377\377\377\0\1""57B\272\207\234\243\302\377\3" \
-  "\233\242\301\377\212\220\254\377PSc\377\202\234\243\302\377\2\230\237" \
-  "\275\377\227\235\273\377\205\234\243\302\377\2ej~\353\30\31\36>\204\377" \
-  "\377\377\0\11\0\0\0\16\0\0\0\5\0\0\0\1!#)\212bg{\351\233\242\300\377" \
-  "ty\220\366>@L\317\37\37$d\205\377\377\377\0\1\0\0\0\16\215\377\377\377" \
-  "\0\2\0\0\0\16\0\0\0\5\213\377\377\377\0\1\0\0\0\15\202\377\377\377\0" \
-  "\2\0\0\0\4\0\0\0\14\236\377\377\377\0\2&'/\227\222\231\266\377\202\234" \
-  "\243\302\377\1\223\232\267\377\207\234\243\302\377\2\207\215\250\375" \
-  "\31\32\37k\203\377\377\377\0\2\0\0\0\16\0\0\0\7\213\377\377\377\0\1\0" \
-  "\0\0\15\213\377\377\377\0\3\0\0\0\3\0\0\0\20\0\0\0\2\202\377\377\377" \
-  "\0\2\0\0\0\30Z^p\347\207\234\243\302\377\4\224\233\270\377\232\241\300" \
-  "\377MQ`\377\224\232\270\377\202\234\243\302\377\1\223\232\267\377\206" \
-  "\234\243\302\377\2""8:F\312\0\0\0\5\204\377\377\377\0\7\0\0\0\14\21\21" \
-  "\24\233*,4\327;>H\276+,5\250\23\23\27C\0\0\0\1\206\377\377\377\0\1\0" \
-  "\0\0\16\213\377\377\377\0\3\0\0\0\2\0\0\0\20\0\0\0\3\213\377\377\377" \
-  "\0\2\0\0\0\12\0\0\0\4\202\377\377\377\0\2\0\0\0\17\0\0\0\1\236\377\377" \
-  "\377\0\2\0\0\0\17HLZ\330\202\234\243\302\377\2\230\237\275\377\227\235" \
-  "\273\377\207\234\243\302\377\1""46A\270\204\377\377\377\0\2\0\0\0\12" \
-  "\0\0\0\13\212\377\377\377\0\1\0\0\0\15\212\377\377\377\0\2\0\0\0\7\0" \
-  "\0\0\16\204\377\377\377\0\2#$+\212\222\231\266\377\206\234\243\302\377" \
-  "\5\232\241\300\377\224\233\270\377\234\243\302\377\207\215\250\377VZ" \
-  "l\376\202\234\243\302\377\2\231\240\276\377\225\234\272\377\205\234\243" \
-  "\302\377\2\214\222\256\376%'.\217\205\377\377\377\0\2\0\0\0\11\0\0\0" \
-  "\15\212\377\377\377\0\1\0\0\0\16\212\377\377\377\0\3\0\0\0\6\0\0\0\17" \
-  "\0\0\0\1\213\377\377\377\0\2\0\0\0\1\0\0\0\15\202\377\377\377\0\2\0\0" \
-  "\0\6\0\0\0\12\240\377\377\377\0\2!\")\203\213\221\255\375\202\234\243" \
-  "\302\377\2\224\232\270\377\232\241\300\377\206\234\243\302\377\2jo\204" \
-  "\355\25\26\32@\204\377\377\377\0\3\0\0\0\5\0\0\0\17\0\0\0\10\210\377" \
-  "\377\377\0\1\0\0\0\15\210\377\377\377\0\3\0\0\0\5\0\0\0\17\0\0\0\10\204" \
-  "\377\377\377\0\2\0\0\0\15FIW\325\207\234\243\302\377\6\222\231\266\377" \
-  "\233\242\301\377\234\243\302\377\233\242\301\377&(/\347\214\223\257\377" \
-  "\202\234\243\302\377\2\224\233\270\377\231\240\276\377\205\234\243\302" \
-  "\377\2]bt\347\25\26\32""1\205\377\377\377\0\3\0\0\0\4\0\0\0\17\0\0\0" \
-  "\12\210\377\377\377\0\1\0\0\0\16\210\377\377\377\0\3\0\0\0\4\0\0\0\17" \
-  "\0\0\0\12\215\377\377\377\0\2\0\0\0\16\0\0\0\2\202\377\377\377\0\1\0" \
-  "\0\0\17\241\377\377\377\0\2\0\0\0\6>AM\317\202\234\243\302\377\2\233" \
-  "\242\301\377\222\231\266\377\207\234\243\302\377\1""36@\303\206\377\377" \
-  "\377\0\4\0\0\0\7\0\0\0\17\0\0\0\12\0\0\0\2\205\377\377\377\0\1\0\0\0" \
-  "\15\206\377\377\377\0\3\0\0\0\10\0\0\0\17\0\0\0\13\206\377\377\377\0" \
-  "\2$&-\227\222\230\265\377\206\234\243\302\377\2\224\233\270\377\231\240" \
-  "\276\377\202\234\243\302\377\3aex\353\17\17\22""97:E\324\203\234\243" \
-  "\302\377\2\222\231\266\377\233\242\301\377\205\234\243\302\377\2""57" \
-  "B\314\0\0\0\17\206\377\377\377\0\4\0\0\0\5\0\0\0\17\0\0\0\13\0\0\0\2" \
-  "\205\377\377\377\0\1\0\0\0\16\206\377\377\377\0\4\0\0\0\7\0\0\0\17\0" \
-  "\0\0\14\0\0\0\1\215\377\377\377\0\2\0\0\0\13\0\0\0\6\202\377\377\377" \
-  "\0\2\0\0\0\10\0\0\0\7\242\377\377\377\0\2\35\37%Rej~\351\202\234\243" \
-  "\302\377\2\232\241\300\377\223\232\267\377\206\234\243\302\377\2\177" \
-  "\204\236\370\36\40&i\207\377\377\377\0\14\0\0\0\4\0\0\0\15\0\0\0\16\0" \
-  "\0\0\14\0\0\0\11\0\0\0\6\0\0\0\2\0\0\0\15\0\0\0\2\0\0\0\5\0\0\0\10\0" \
-  "\0\0\13\202\0\0\0\16\1\0\0\0\7\207\377\377\377\0\2\10\10\12!W[l\342\206" \
-  "\234\243\302\377\2\226\235\273\377\227\236\274\377\202\234\243\302\377" \
-  "\5\205\213\245\374'(0\223\377\377\377\0\30\31\36Odi}\356\202\234\243" \
-  "\302\377\2\233\242\301\377\222\231\266\377\205\234\243\302\377\3\225" \
-  "\233\271\37702<\312\0\0\0\20\207\377\377\377\0\14\0\0\0\3\0\0\0\14\0" \
-  "\0\0\16\0\0\0\15\0\0\0\11\0\0\0\6\0\0\0\3\0\0\0\16\0\0\0\1\0\0\0\4\0" \
-  "\0\0\10\0\0\0\13\202\0\0\0\16\1\0\0\0\10\217\377\377\377\0\2\0\0\0\7" \
-  "\0\0\0\11\202\377\377\377\0\2\0\0\0\3\0\0\0\16\244\377\377\377\0\2\"" \
-  "#*||\202\233\364\202\234\243\302\377\2\230\237\276\377\225\233\271\377" \
-  "\206\234\243\302\377\2@CP\322\0\0\0\10\211\377\377\377\0\11\0\0\0\1\0" \
-  "\0\0\5\0\0\0\10\0\0\0\13\0\0\0\31\0\0\0\14\0\0\0\10\0\0\0\5\0\0\0\2\212" \
-  "\377\377\377\0\2+-5\260\231\240\276\377\205\234\243\302\377\2\230\237" \
-  "\275\377\225\233\271\377\202\234\243\302\377\3\222\231\266\377+-5\265" \
-  "\0\0\0\1\202\377\377\377\0\2$&.\245\215\223\257\377\202\234\243\302\377" \
-  "\2\232\241\277\377\224\232\270\377\205\234\243\302\377\3\225\234\272" \
-  "\37724>\313\0\0\0\22\211\377\377\377\0\11\0\0\0\1\0\0\0\4\0\0\0\7\0\0" \
-  "\0\12\0\0\0\32\0\0\0\14\0\0\0\11\0\0\0\6\0\0\0\3\221\377\377\377\0\2" \
-  "\0\0\0\4\0\0\0\14\202\377\377\377\0\2\0\0\0\1\0\0\0\20\246\377\377\377" \
-  "\0\2&'/\243\215\224\260\375\202\234\243\302\377\2\227\235\273\377\226" \
-  "\235\273\377\205\234\243\302\377\2\215\224\260\377%'.\235\215\377\377" \
-  "\377\0\1\0\0\0\15\215\377\377\377\0\2\35\36$Xnr\210\356\205\234\243\302" \
-  "\377\2\231\240\276\377\224\232\270\377\202\234\243\302\377\3\232\241" \
-  "\277\37758C\313\0\0\0\12\203\377\377\377\0\3\0\0\0\13:<H\322\231\240" \
-  "\276\377\202\234\243\302\377\2\227\236\274\377\225\234\272\377\205\234" \
-  "\243\302\377\3\227\235\273\37736@\314\0\0\0\23\214\377\377\377\0\1\0" \
-  "\0\0\16\224\377\377\377\0\2\0\0\0\3\0\0\0\16\203\377\377\377\0\2\0\0" \
-  "\0\17\0\0\0\2\246\377\377\377\0\3\0\0\0\5-09\276\230\237\275\377\202" \
-  "\234\243\302\377\2\227\236\274\377\225\233\271\377\205\234\243\302\377" \
-  "\2v{\222\363\"#*s\214\377\377\377\0\1\0\0\0\15\214\377\377\377\0\2\23" \
-  "\23\27""0PSc\337\205\234\243\302\377\2\227\236\274\377\225\233\271\377" \
-  "\203\234\243\302\377\2HKY\332\15\15\20\40\205\377\377\377\0\3\33\35\"" \
-  "ETWh\345\232\241\300\377\202\234\243\302\377\2\230\237\275\377\224\233" \
-  "\270\377\205\234\243\302\377\3\227\236\274\37758B\314\6\7\10\25\213\377" \
-  "\377\377\0\1\0\0\0\16\223\377\377\377\0\2\0\0\0\6\0\0\0\15\203\377\377" \
-  "\377\0\2\0\0\0\14\0\0\0\5\250\377\377\377\0\2\0\0\0\24=\77L\317\203\234" \
-  "\243\302\377\3\231\240\276\377\223\232\267\377\233\242\301\377\204\234" \
-  "\243\302\377\2]bt\347\34\36#G\213\377\377\377\0\1\0\0\0\15\213\377\377" \
-  "\377\0\2\0\0\0\23:=H\322\205\234\243\302\377\2\225\234\272\377\227\235" \
-  "\273\377\203\234\243\302\377\2_dw\346\33\35\"E\207\377\377\377\0\2\35" \
-  "\36$RSWh\345\203\234\243\302\377\3\232\241\277\377\223\232\267\377\233" \
-  "\242\301\377\204\234\243\302\377\3\230\237\275\377CFT\323\35\36$c\212" \
-  "\377\377\377\0\1\0\0\0\16\222\377\377\377\0\2\0\0\0\11\0\0\0\12\203\377" \
-  "\377\377\0\202\0\0\0\11\252\377\377\377\0\3\20\21\24(9;G\314\226\235" \
-  "\273\377\202\234\243\302\377\3\232\241\300\377\223\232\267\377\232\241" \
-  "\277\377\204\234\243\302\377\2EIV\333\17\20\23#\212\377\377\377\0\1\0" \
-  "\0\0\15\212\377\377\377\0\3\0\0\0\6,.6\301\227\235\273\377\204\234\243" \
-  "\302\377\2\224\232\270\377\230\237\276\377\203\234\243\302\377\2TWh\337" \
-  "\40!'[\211\377\377\377\0\3\34\35#SSWh\345\232\241\300\377\202\234\243" \
-  "\302\377\3\233\242\301\377\224\232\270\377\231\240\276\377\205\234\243" \
-  "\302\377\3z\200\230\365.0:\274\20\20\24)\210\377\377\377\0\1\0\0\0\16" \
-  "\221\377\377\377\0\2\0\0\0\14\0\0\0\6\203\377\377\377\0\202\0\0\0\12" \
-  "\254\377\377\377\0\3\0\0\0\20+,5\270\212\220\254\373\203\234\243\302" \
-  "\377\2\224\233\270\377\225\234\272\377\203\234\243\302\377\3\232\241" \
-  "\277\377BER\332\35\36$F\211\377\377\377\0\1\0\0\0\15\211\377\377\377" \
-  "\0\3\5\5\6\32.09\305\216\224\261\376\203\234\243\302\377\3\227\236\274" \
-  "\377\223\232\267\377\232\241\300\377\202\234\243\302\377\3\227\236\274" \
-  "\377=@L\322\24\25\31""2\213\377\377\377\0\3\35\36$RTWh\345\230\237\276" \
-  "\377\203\234\243\302\377\202\225\233\271\377\1\233\242\301\377\204\234" \
-  "\243\302\377\4\232\241\300\377Y]o\346%'.\231\0\0\0\12\206\377\377\377" \
-  "\0\1\0\0\0\16\217\377\377\377\0\3\0\0\0\5\0\0\0\16\0\0\0\3\203\377\377" \
-  "\377\0\2\0\0\0\16\0\0\0\7\256\377\377\377\0\3\0\0\0\3$%,\231w}\224\361" \
-  "\203\234\243\302\377\3\231\240\276\377\223\232\267\377\227\235\273\377" \
-  "\203\234\243\302\377\2^cv\350#%,{\210\377\377\377\0\1\0\0\0\15\210\377" \
-  "\377\377\0\3\34\36#GCFS\331\230\237\276\377\202\234\243\302\377\3\230" \
-  "\237\276\377\223\232\267\377\227\236\274\377\203\234\243\302\377\3\215" \
-  "\223\257\376.0:\277\0\0\0\23\215\377\377\377\0\3\36\37%QTXh\344\227\235" \
-  "\273\377\203\234\243\302\377\3\232\241\277\377\223\232\267\377\225\234" \
-  "\272\377\205\234\243\302\377\4\216\224\261\377=@L\325\37\40'|\0\0\0\30" \
-  "\204\377\377\377\0\1\0\0\0\16\215\377\377\377\0\3\0\0\0\21\26\26\33x" \
-  "\3\3\3$\203\377\377\377\0\3\0\0\0\2\0\0\0\20\0\0\0\4\261\377\377\377" \
-  "\0\2\36\40&r_cv\344\204\234\243\302\377\3\230\237\275\377\223\232\267" \
-  "\377\230\237\275\377\202\234\243\302\377\3{\200\231\367)*3\256\5\6\7" \
-  "\30\206\377\377\377\0\1\0\0\0\15\206\377\377\377\0\3\0\0\0\7#%,\207`" \
-  "dw\351\202\234\243\302\377\3\232\241\277\377\224\232\270\377\226\235" \
-  "\273\377\204\234\243\302\377\3z\200\230\365&(/\243\0\0\0\4\217\377\377" \
-  "\377\0\3\31\33\40>58B\313\204\213\245\375\204\234\243\302\377\3\231\240" \
-  "\276\377\223\232\267\377\227\235\273\377\205\234\243\302\377\7\216\224" \
-  "\261\377]as\352>@M\304()1\230\16\17\22;\0\0\0\1\0\0\0\16\212\377\377" \
-  "\377\0\6\0\0\0\24\32\33!g-/8\272ADR\344\34\35#\307\0\0\0\3\202\377\377" \
-  "\377\0\3\0\0\0\4\0\0\0\20\0\0\0\1\263\377\377\377\0\3\27\30\35\77""4" \
-  "6A\302|\202\232\367\204\234\243\302\377\10\227\235\273\377\224\232\270" \
-  "\377\224\233\270\377\230\237\275\377\225\233\271\377W[l\345-/8\255\21" \
-  "\21\25.\204\377\377\377\0\1\0\0\0\15\204\377\377\377\0\10\0\0\0\23()" \
-  "1\224HLZ\330\213\221\255\377\232\241\277\377\225\233\271\377\224\232" \
-  "\270\377\225\234\272\377\204\234\243\302\377\3\214\223\256\377ADQ\323" \
-  "!\")m\222\377\377\377\0\4\0\0\0\5\"#+\216TXi\345\226\235\273\377\204" \
-  "\234\243\302\377\1\230\237\275\377\202\224\233\270\377\1\230\237\275" \
-  "\377\205\234\243\302\377\27\230\237\276\377rw\216\366EHV\324,.7\261#" \
-  "%,\221\37\40'x\27\30\35X\7\7\11\77\24\25\31R\35\36$j\40!(\200%&.\233" \
-  "35\77\267>AM\322TXh\351~\204\234\376\230\237\275\37703<\311\0\0\0\14" \
-  "\377\377\377\0\0\0\0\2\0\0\0\15\0\0\0\13\267\377\377\377\0\3\35\36$`" \
-  "=\77L\314\210\216\251\374\205\234\243\302\377\1\227\236\274\377\202\224" \
-  "\232\270\377\21\225\233\271\377afz\35657B\276)+3\242\40\"(|\13\13\16" \
-  "@\0\0\0%\4\5\6""3\36\37%m&(/\23313=\264QUf\343\216\225\261\377\224\233" \
-  "\270\377\224\232\270\377\226\235\273\377\233\242\301\377\204\234\243" \
-  "\302\377\4\224\233\270\377LP_\334$&-\211\0\0\0\7\225\377\377\377\0\4" \
-  "\17\20\23*.0:\301z\177\230\371\230\237\276\377\205\234\243\302\377\1" \
-  "\230\237\275\377\202\224\232\270\377\3\226\235\273\377\230\237\276\377" \
-  "\232\241\300\377\203\234\243\302\377\23\223\232\267\377\232\241\300\377" \
-  "\217\226\262\377\202\210\242\377w}\225\377|\201\232\377\203\211\243\377" \
-  "\211\216\252\377\222\230\265\377\225\234\272\377\232\241\300\377\234" \
-  "\243\302\377{\201\231\366.09\272\5\5\7\31\0\0\0\1\0\0\0\14\0\0\0\15\0" \
-  "\0\0\1\271\377\377\377\0\4\0\0\0\3\"$*zHKY\326\221\230\265\377\206\234" \
-  "\243\302\377\15\231\240\276\377\227\235\273\377\225\233\271\377\224\233" \
-  "\270\377\211\217\253\377tx\217\375W[m\356ms\211\371\203\212\243\377\223" \
-  "\232\267\377\224\233\270\377\226\235\273\377\230\237\276\377\206\234" \
-  "\243\302\377\4\231\240\276\377Y]n\345(*2\236\0\0\0\21\230\377\377\377" \
-  "\0\5\0\0\0\1!\")uCFS\331~\203\235\375\232\241\277\377\206\234\243\302" \
-  "\377\3\231\240\276\377\227\236\274\377\225\234\272\377\203\224\233\270" \
-  "\377\1\214\222\256\377\204\224\233\270\377\3\226\235\273\377\230\237" \
-  "\275\377\233\242\301\377\202\234\243\302\377\7\224\233\270\377EHV\332" \
-  "\36\40&k\377\377\377\0\0\0\0\12\0\0\0\16\0\0\0\3\275\377\377\377\0\5" \
-  "\0\0\0\13$%-\214:<H\305\\`r\351\217\226\262\377\211\234\243\302\377\1" \
-  "\224\232\270\377\211\234\243\302\377\5\227\235\273\377ko\205\362>AM\317" \
-  "()1\244\14\14\17\"\234\377\377\377\0\6\0\0\0\11\30\32\37f/1;\266LO^\341" \
-  "\204\211\243\377\232\241\300\377\211\234\243\302\377\1\223\232\267\377" \
-  "\207\234\243\302\377\4\220\226\263\377UXi\340*+4\252\0\0\0\32\202\0\0" \
-  "\0\16\1\0\0\0\5\302\377\377\377\0\5\0\0\0\33\37\40&~57B\270PTd\336\205" \
-  "\213\246\375\206\234\243\302\377\1\224\232\270\377\206\234\243\302\377" \
-  "\5\217\226\262\377]at\351;=I\303$&-\225\7\10\11""1\242\377\377\377\0" \
-  "\6\0\0\0\15\35\37%q35@\274QTd\346\203\211\242\377\230\237\275\377\206" \
-  "\234\243\302\377\1\223\232\267\377\204\234\243\302\377\7\232\241\300" \
-  "\377mr\207\361;=I\305\37\40'\204\0\0\0\34\0\0\0\15\0\0\0\6\310\377\377" \
-  "\377\0\21\0\0\0\14\27\30\34c\"#*\233+-6\25046@\266;>J\304BER\321KN]\336" \
-  "VZl\350PSc\340CGT\325=@L\30769D\271.09\254%&.\237\35\36${\0\0\0\32\250" \
-  "\377\377\377\0\22\0\0\0\21\35\37%s!#*\236)+4\25624>\272:=H\307ADQ\324" \
-  "IKZ\341\\_r\354gl\201\371]bt\354FIW\333<\77L\31014=\265#%,\240\12\13" \
-  "\15B\0\0\0\14\0\0\0\4\322\377\377\377\0\3\0\0\0\5\0\0\0%\0\0\0\12\266" \
-  "\377\377\377\0\4\0\0\0\3\0\0\0\31\0\0\0=\0\0\0\34\332\377\377\377\0\1" \
-  "\0\0\0\15\271\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\15\271" \
-  "\377\377\377\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\15\271\377\377\377" \
-  "\0\1\0\0\0\16\333\377\377\377\0\1\0\0\0\2\271\377\377\377\0\1\0\0\0\2" \
-  "\377\377\377\377\0\377\377\377\377\0\377\377\377\377\0\377\377\377\377" \
-  "\0\305\377\377\377\0\2\225\225\225\30\222\222\222\25\222\377\377\377" \
-  "\0\2\217\217\217\31\214\214\214\24\206\377\377\377\0\2\223\223\223\32" \
-  "\224\224\224\23\215\377\377\377\0\3\231\231\231\5\223\223\223(\377\377" \
-  "\377\1\350\377\377\377\0\2\222\222\222\237\222\222\222\210\222\377\377" \
-  "\377\0\2\222\222\222\241\223\223\223\206\206\377\377\377\0\2\222\222" \
-  "\222\253\222\222\222|\215\377\377\377\0\3\217\217\217\40\222\222\222" \
-  "\377\222\222\222\7\350\377\377\377\0\2\222\222\222\237\222\222\222\210" \
-  "\222\377\377\377\0\2\222\222\222\241\223\223\223\206\206\377\377\377" \
-  "\0\2\222\222\222\253\222\222\222|\215\377\377\377\0\3\217\217\217\40" \
-  "\222\222\222\377\222\222\222\7\264\377\377\377\0\4\0\0\0%\0\0\0}\0\0" \
-  "\0\217\0\0\0R\203\377\377\377\0\6\0\0\0U\0\0\0-\0\0\0W\0\0\0\221\0\0" \
-  "\0s\0\0\0\10\203\377\377\377\0\4\0\0\0;\0\0\0\206\0\0\0\216\0\0\0F\202" \
-  "\377\377\377\0\6\0\0\0\33\0\0\0f\0\0\0\30\0\0\0x\0\0\0\203\0\0\0&\205" \
-  "\377\377\377\0\21\221\221\221%\222\222\222|\222\222\222\223\221\221\221" \
-  "_\377\377\377\1\377\377\377\0\252\252\252\3\222\222\222p\225\225\225" \
-  "\30\221\221\221m\221\221\221\220\222\222\222K\377\377\377\0\223\223\223" \
-  "B\223\223\223\213\222\222\222^\237\237\237\10\202\377\377\377\0\6\222" \
-  "\222\222\237\222\222\222\210\221\221\221H\222\222\222\215\223\223\223" \
-  "}\216\216\216\22\203\377\377\377\0\4\221\221\221,\223\223\223\177\223" \
-  "\223\223\222\223\223\223W\203\377\377\377\0\6\252\252\252\3\223\223\223" \
-  "a\221\221\221\225\222\222\222u\222\222\222\267\223\223\223\206\202\377" \
-  "\377\377\0\6\200\200\200\4\222\222\222e\221\221\221\225\221\221\221r" \
-  "\222\222\222\276\222\222\222|\202\377\377\377\0\5\200\200\200\4\223\223" \
-  "\223a\223\223\223\222\221\221\221\200\225\225\225\35\203\377\377\377" \
-  "\0\6\223\223\223(\223\223\223\204\222\222\222\217\223\223\223h\222\222" \
-  "\222\377\222\222\222\7\263\377\377\377\0\6\0\0\0""5\0\0\0\362\0\0\0\260" \
-  "\0\0\0\205\0\0\0\352\0\0\0\220\202\377\377\377\0\6\0\0\0\304\0\0\0\355" \
-  "\0\0\0\256\0\0\0\222\0\0\0\360\0\0\0\261\202\377\377\377\0\16\0\0\0j" \
-  "\0\0\0\340\0\0\0\203\0\0\0\207\0\0\0\350\0\0\0_\377\377\377\0\0\0\0>" \
-  "\0\0\0\370\0\0\0\327\0\0\0\222\0\0\0\236\0\0\0\375\0\0\0\36\203\377\377" \
-  "\377\0\22\220\220\220>\222\222\222\345\222\222\222\226\222\222\222w\223" \
-  "\223\223\326\222\222\222\224\377\377\377\0\237\237\237\10\222\222\222" \
-  "\377\222\222\222\336\222\222\222\235\223\223\223\222\222\222\222\367" \
-  "\222\222\222\267\222\222\222\311\223\223\223\206\222\222\222\315\221" \
-  "\221\221\254\202\377\377\377\0\16\222\222\222\237\222\222\222\357\222" \
-  "\222\222\303\221\221\221\216\222\222\222\347\222\222\222\323\252\252" \
-  "\252\3\377\377\377\0\222\222\222K\222\222\222\345\221\221\221\220\221" \
-  "\221\221{\222\222\222\334\222\222\222\203\202\377\377\377\0\36\222\222" \
-  "\222\264\222\222\222\357\221\221\221\216\222\222\222\215\222\222\222" \
-  "\350\223\223\223\206\377\377\377\0\377\377\377\1\222\222\222\275\222" \
-  "\222\222\354\223\223\223\213\222\222\222\217\222\222\222\353\222\222" \
-  "\222|\377\377\377\0\200\200\200\2\222\222\222\277\223\223\223\301\222" \
-  "\222\222p\223\223\223\247\222\222\222\352\220\220\220\27\377\377\377" \
-  "\0\222\222\222=\222\222\222\366\222\222\222\302\221\221\221{\223\223" \
-  "\223\265\222\222\222\377\222\222\222\7\263\377\377\377\0\2\0\0\0\270" \
-  "\0\0\0\231\202\377\377\377\0\6\0\0\0""0\0\0\0\375\0\0\0\"\377\377\377" \
-  "\0\0\0\0\304\0\0\0t\202\377\377\377\0\6\0\0\0""5\0\0\0\377\0\0\0$\0\0" \
-  "\0\17\0\0\0\363\0\0\0""2\202\377\377\377\0\6\0\0\0h\0\0\0\324\377\377" \
-  "\377\0\0\0\0>\0\0\0\357\0\0\0\16\202\377\377\377\0\2\0\0\0\275\0\0\0" \
-  "j\203\377\377\377\0\2\222\222\222\316\223\223\223h\202\377\377\377\0" \
-  "\6\224\224\2242\222\222\222\375\225\225\225\14\237\237\237\10\222\222" \
-  "\222\377\221\221\2213\202\377\377\377\0\2\222\222\222\246\222\222\222" \
-  "\253\202\377\377\377\0\6\220\220\220.\222\222\222\360\252\252\252\3\377" \
-  "\377\377\0\222\222\222\237\222\222\222\232\202\377\377\377\0\6\217\217" \
-  "\217\20\222\222\222\375\223\223\223I\377\377\377\0\222\222\222\336\223" \
-  "\223\223W\202\377\377\377\0\6\221\221\221C\222\222\222\366\200\200\200" \
-  "\2\222\222\222K\222\222\222\375\225\225\225\30\202\377\377\377\0\6\222" \
-  "\222\222\241\223\223\223\206\377\377\377\0\223\223\223U\222\222\222\372" \
-  "\226\226\226\21\202\377\377\377\0\6\222\222\222\253\222\222\222|\377" \
-  "\377\377\0\221\221\221]\222\222\222\327\377\377\377\1\202\377\377\377" \
-  "\0\5\223\223\223\301\222\222\222z\377\377\377\0\222\222\222\312\221\221" \
-  "\221\227\202\377\377\377\0\3\217\217\217\40\222\222\222\377\222\222\222" \
-  "\7\263\377\377\377\0\2\0\0\0\354\0\0\0Y\202\377\377\377\0\6\0\0\0\1\0" \
-  "\0\0\353\0\0\0S\377\377\377\0\0\0\0\304\0\0\0c\202\377\377\377\0\5\0" \
-  "\0\0\4\0\0\0\364\0\0\0H\0\0\0=\0\0\0\372\203\0\0\0\300\5\0\0\0\315\0" \
-  "\0\0\366\377\377\377\0\0\0\0>\0\0\0\351\203\377\377\377\0\2\0\0\0\241" \
-  "\0\0\0\221\202\377\377\377\0\3\216\216\216\11\222\222\222\375\222\222" \
-  "\222\307\203\222\222\222\300\5\222\222\222\377\224\224\224+\237\237\237" \
-  "\10\222\222\222\377\224\224\224\37\202\377\377\377\0\2\223\223\223\222" \
-  "\222\222\222\237\202\377\377\377\0\6\224\224\224\23\222\222\222\377\220" \
-  "\220\220\27\377\377\377\0\222\222\222\237\222\222\222\210\203\377\377" \
-  "\377\0\5\222\222\222\322\222\222\222l\225\225\225\30\222\222\222\377" \
-  "\222\222\222\303\202\222\222\222\300\5\222\222\222\304\222\222\222\377" \
-  "\216\216\216\33\222\222\222\201\223\223\223\310\203\377\377\377\0\5\222" \
-  "\222\222\241\223\223\223\206\377\377\377\0\222\222\222\214\222\222\222" \
-  "\275\203\377\377\377\0\5\222\222\222\253\222\222\222|\377\377\377\0\222" \
-  "\222\222\226\223\223\223\344\203\222\222\222\300\5\223\223\223\344\221" \
-  "\221\221\234\231\231\231\5\222\222\222\373\223\223\223I\202\377\377\377" \
-  "\0\3\217\217\217\40\222\222\222\377\222\222\222\7\263\377\377\377\0\2" \
-  "\0\0\0\357\0\0\0W\203\377\377\377\0\5\0\0\0\347\0\0\0V\377\377\377\0" \
-  "\0\0\0\304\0\0\0c\202\377\377\377\0\5\0\0\0\12\0\0\0\370\0\0\0\77\0\0" \
-  "\0B\0\0\0\360\204\0\0\0(\4\0\0\0'\377\377\377\0\0\0\0>\0\0\0\351\203" \
-  "\377\377\377\0\2\0\0\0\236\0\0\0\221\202\377\377\377\0\3\211\211\211" \
-  "\15\222\222\222\377\224\224\224E\204\223\223\223(\4\222\222\222\7\237" \
-  "\237\237\10\222\222\222\377\224\224\224\37\202\377\377\377\0\2\221\221" \
-  "\221\220\222\222\222\237\202\377\377\377\0\6\217\217\217\20\222\222\222" \
-  "\377\220\220\220\27\377\377\377\0\222\222\222\237\222\222\222\210\203" \
-  "\377\377\377\0\5\222\222\222\333\222\222\222b\225\225\225\35\222\222" \
-  "\222\377\220\220\2207\204\223\223\223(\3\231\231\231\5\222\222\222\214" \
-  "\222\222\222\270\203\377\377\377\0\5\222\222\222\241\223\223\223\206" \
-  "\377\377\377\0\222\222\222\226\223\223\223\256\203\377\377\377\0\5\222" \
-  "\222\222\253\222\222\222|\377\377\377\0\222\222\222\233\222\222\222\244" \
-  "\204\223\223\223(\4\217\217\217\31\213\213\213\13\222\222\222\377\221" \
-  "\221\221:\202\377\377\377\0\3\217\217\217\40\222\222\222\377\222\222" \
-  "\222\7\263\377\377\377\0\2\0\0\0\300\0\0\0\235\202\377\377\377\0\6\0" \
-  "\0\0,\0\0\0\377\0\0\0(\377\377\377\0\0\0\0\304\0\0\0c\202\377\377\377" \
-  "\0\6\0\0\0M\0\0\0\370\0\0\0\25\0\0\0\24\0\0\0\371\0\0\0""8\203\377\377" \
-  "\377\0\4\0\0\0\11\377\377\377\0\0\0\0>\0\0\0\351\203\377\377\377\0\2" \
-  "\0\0\0\236\0\0\0\221\203\377\377\377\0\2\222\222\222\330\222\222\222" \
-  "n\203\377\377\377\0\5\237\237\237\10\377\377\377\1\237\237\237\10\222" \
-  "\222\222\377\224\224\224\37\202\377\377\377\0\2\221\221\221\220\222\222" \
-  "\222\237\202\377\377\377\0\6\217\217\217\20\222\222\222\377\220\220\220" \
-  "\27\377\377\377\0\222\222\222\237\222\222\222\210\202\377\377\377\0\6" \
-  "\222\222\222#\222\222\222\377\222\222\222/\377\377\377\0\222\222\222" \
-  "\350\221\221\221]\203\377\377\377\0\5\216\216\216\11\377\377\377\0\222" \
-  "\222\222e\222\222\222\361\252\252\252\3\202\377\377\377\0\6\222\222\222" \
-  "\253\223\223\223\206\377\377\377\0\223\223\223o\222\222\222\351\377\377" \
-  "\377\1\202\377\377\377\0\6\223\223\223\265\222\222\222|\377\377\377\0" \
-  "\223\223\223h\222\222\222\327\222\222\222\7\203\377\377\377\0\4\216\216" \
-  "\216\11\377\377\377\0\222\222\222\343\223\223\223v\202\377\377\377\0" \
-  "\3\222\222\222*\222\222\222\377\222\222\222\7\263\377\377\377\0\6\0\0" \
-  "\0>\0\0\0\365\0\0\0\245\0\0\0u\0\0\0\337\0\0\0\236\202\377\377\377\0" \
-  "\6\0\0\0\304\0\0\0\321\0\0\0z\0\0\0\227\0\0\0\365\0\0\0}\202\377\377" \
-  "\377\0\11\0\0\0w\0\0\0\356\0\0\0\201\0\0\0e\0\0\0\225\0\0\0\305\377\377" \
-  "\377\0\0\0\0>\0\0\0\351\203\377\377\377\0\2\0\0\0\236\0\0\0\221\203\377" \
-  "\377\377\0\6\221\221\221H\222\222\222\363\222\222\222\224\223\223\223" \
-  "c\222\222\222\210\222\222\222\341\202\237\237\237\10\2\222\222\222\377" \
-  "\224\224\224\37\202\377\377\377\0\2\221\221\221\220\222\222\222\237\202" \
-  "\377\377\377\0\12\217\217\217\20\222\222\222\377\220\220\220\27\377\377" \
-  "\377\0\222\222\222\237\222\222\222\327\223\223\223q\222\222\222z\222" \
-  "\222\222\342\223\223\223\247\202\377\377\377\0&\221\221\221V\222\222" \
-  "\222\363\221\221\221\216\223\223\223c\222\222\222\214\222\222\222\337" \
-  "\377\377\377\0\225\225\225\14\222\222\222\347\223\223\223\326\222\222" \
-  "\222|\222\222\222\267\222\222\222\366\223\223\223\206\377\377\377\0\226" \
-  "\226\226\21\222\222\222\354\222\222\222\322\221\221\221{\222\222\222" \
-  "\274\222\222\222\366\222\222\222|\377\377\377\0\231\231\231\5\222\222" \
-  "\222\312\222\222\222\313\221\221\221k\221\221\221r\221\221\221\263\221" \
-  "\221\221y\377\377\377\0\223\223\223q\222\222\222\372\222\222\222\233" \
-  "\221\221\221\211\222\222\222\341\222\222\222\377\222\222\222\7\264\377" \
-  "\377\377\0\5\0\0\0""0\0\0\0\215\0\0\0\237\0\0\0b\0\0\0\1\202\377\377" \
-  "\377\0\5\0\0\0\304\0\0\0\220\0\0\0\211\0\0\0\220\0\0\0J\204\377\377\377" \
-  "\0\10\0\0\0\77\0\0\0\211\0\0\0\237\0\0\0\200\0\0\0-\377\377\377\0\0\0" \
-  "\0\37\0\0\0t\203\377\377\377\0\2\0\0\0O\0\0\0H\204\377\377\377\0\11\224" \
-  "\224\224&\222\222\222\201\222\222\222\237\222\222\222\212\223\223\223" \
-  "B\377\377\377\0\200\200\200\4\221\221\221\200\231\231\231\17\202\377" \
-  "\377\377\0\2\221\221\221H\221\221\221O\202\377\377\377\0\12\237\237\237" \
-  "\10\221\221\221\200\213\213\213\13\377\377\377\0\221\221\221O\221\221" \
-  "\221d\222\222\222\214\222\222\222\244\223\223\223j\252\252\252\3\203" \
-  "\377\377\377\0\5\220\220\220.\223\223\223\204\222\222\222\237\221\221" \
-  "\221\207\223\223\223;\202\377\377\377\0\6\223\223\223!\222\222\222\221" \
-  "\222\222\222\232\224\224\224L\223\223\223P\221\221\221C\202\377\377\377" \
-  "\0\6\224\224\224&\222\222\222\223\222\222\222\230\223\223\223G\223\223" \
-  "\223U\220\220\220>\202\377\377\377\0\6\231\231\231\5\222\222\222e\221" \
-  "\221\221\225\222\222\222\230\222\222\222i\216\216\216\22\202\377\377" \
-  "\377\0\6\222\222\222b\222\222\222\242\222\222\222~\221\221\221%\221\221" \
-  "\221\200\252\252\252\3\273\377\377\377\0\2\0\0\0\304\0\0\0c\377\377\377" \
-  "\377\0\225\377\377\377\0\2\0\0\0\304\0\0\0c\354\377\377\377\0")
+  "\310\354\354\341\377\2\342\342\330\377\352\352\337\377\323\354\354\341" \
+  "\377\2\346\346\333\377\345\345\332\377\377\354\354\341\377\206\354\354" \
+  "\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343" \
+  "\343\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331" \
+  "\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342" \
+  "\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342\330\377\377" \
+  "\354\354\341\377\206\354\354\341\377\2\335\335\322\377\350\350\335\377" \
+  "\323\354\354\341\377\2\343\343\331\377\342\342\330\377\375\354\354\341" \
+  "\377\21\346\346\333\377\305\305\273\377\240\240\230\377xyu\377efd\377" \
+  "XYY\377LLM\377FGH\377\77@B\377CDF\377GHI\377QQR\377]^]\377kki\377\210" \
+  "\210\204\377\257\257\247\377\323\323\312\377\303\354\354\341\377\6\337" \
+  "\337\325\377\272\272\261\377\216\216\210\377ab`\377JJJ\377>\77@\377\202" \
+  "<=\77\377\12;<@\37779=\37789=\377\77@B\377YYY\377~~z\377\242\242\232" \
+  "\377\306\306\274\377\342\342\330\377\350\350\335\377\362\354\354\341" \
+  "\377\32\337\337\324\377\231\231\222\377OPP\377\77@D\377@BH\377TVb\377" \
+  "fk~\377}\203\233\377\211\217\253\377\220\227\264\377\230\237\276\377" \
+  "\234\243\302\377\222\230\265\377\231\240\276\377\234\243\302\377\225" \
+  "\234\272\377\215\224\260\377\205\213\246\377sx\217\377_br\377KNV\377" \
+  "=>C\377@AC\377iig\377\271\271\260\377\353\353\340\377\271\354\354\341" \
+  "\377\34\347\347\334\377\260\260\250\377fge\377>\77A\3778:=\377=\77F\377" \
+  "RTa\377fj\177\377\177\205\237\377\216\225\261\377\230\237\275\377\232" \
+  "\241\300\377\233\242\301\377\234\243\302\377\226\235\273\377\225\234" \
+  "\272\377\233\242\301\377\211\220\253\377rw\215\377\\`q\377HKT\3778:=" \
+  "\377BCD\377\216\216\210\377\322\322\307\377\334\334\322\377\344\344\331" \
+  "\377\353\353\340\377\352\354\354\341\377\6\323\323\311\377\206\207\202" \
+  "\377EFG\377CEL\377hm\201\377\224\232\270\377\211\234\243\302\377\2\222" \
+  "\230\265\377\231\240\276\377\211\234\243\302\377\6\204\212\244\377X[" \
+  "i\377<=A\377XXX\377\247\247\237\377\345\345\332\377\263\354\354\341\377" \
+  "\10\322\322\310\377\212\213\206\377FFH\37778=\377SVc\377w}\225\377\224" \
+  "\233\270\377\232\241\277\377\211\234\243\302\377\2\226\235\273\377\225" \
+  "\234\272\377\206\234\243\302\377\11\224\233\270\377dhz\377<=B\377TTT" \
+  "\377\247\247\240\377\330\330\316\377\332\332\320\377\342\342\330\377" \
+  "\352\352\337\377\344\354\354\341\377\6\303\303\272\377stq\377=>A\377" \
+  "HJS\377qv\214\377\230\237\276\377\214\234\243\302\377\2\222\230\265\377" \
+  "\231\240\276\377\214\234\243\302\377\6\214\222\256\377^bs\377;<A\377" \
+  "JJK\377\225\225\217\377\335\335\322\377\255\354\354\341\377\10\352\352" \
+  "\337\377\244\244\235\377BCD\377\77AI\377bgz\377\210\217\252\377\225\234" \
+  "\272\377\232\241\300\377\214\234\243\302\377\2\226\235\273\377\225\234" \
+  "\272\377\211\234\243\302\377\11\213\221\255\377Y\\j\3779:=\377hhf\377" \
+  "\312\312\302\377\332\332\320\377\331\331\317\377\337\337\325\377\351" \
+  "\351\336\377\337\354\354\341\377\5\232\232\224\37789;\377PS^\377z\200" \
+  "\230\377\233\242\301\377\217\234\243\302\377\2\222\230\265\377\231\240" \
+  "\276\377\217\234\243\302\377\5\222\230\265\377ej|\377=\77F\377MNN\377" \
+  "\314\314\303\377\251\354\354\341\377\7\332\332\320\377yyv\377569\377" \
+  "TWe\377\207\215\250\377\227\235\273\377\233\242\301\377\217\234\243\302" \
+  "\377\2\226\235\273\377\225\234\272\377\214\234\243\302\377\10~\203\234" \
+  "\377:<A\377}~z\377\347\347\334\377\344\344\331\377\333\333\321\377\331" \
+  "\331\317\377\346\346\333\377\333\354\354\341\377\4\261\261\251\377<=" \
+  "\77\377]ap\377\230\237\276\377\213\234\243\302\377\20\232\241\277\377" \
+  "\230\237\275\377\226\235\273\377\224\233\270\377\222\231\266\377\220" \
+  "\227\264\377\207\215\250\377ko\205\377w}\226\377\215\223\260\377\221" \
+  "\230\265\377\223\232\267\377\225\233\271\377\227\235\273\377\230\237" \
+  "\276\377\232\241\300\377\213\234\243\302\377\4\206\214\247\377@BI\377" \
+  "`a_\377\331\331\317\377\245\354\354\341\377\6\340\340\326\377mnk\377" \
+  ">>D\377ko\205\377\222\230\265\377\232\241\300\377\213\234\243\302\377" \
+  "\5\232\241\277\377\230\237\275\377\226\235\273\377\224\233\270\377\222" \
+  "\231\266\377\202\220\227\264\377\2\213\221\255\377\212\220\254\377\202" \
+  "\220\227\264\377\5\222\231\266\377\224\233\270\377\226\235\273\377\230" \
+  "\237\275\377\232\241\277\377\207\234\243\302\377\10jn\202\37789;\377" \
+  "\261\261\251\377\354\354\341\377\352\352\337\377\335\335\322\377\332" \
+  "\332\320\377\350\350\335\377\327\354\354\341\377\4\306\306\274\377HI" \
+  "J\377QTa\377\224\232\270\377\211\234\243\302\377\2\227\236\274\377\222" \
+  "\230\265\377\202\220\227\264\377\20\222\231\266\377nt\212\377TXe\377" \
+  "CEL\377@AF\377EFH\377VWX\377rsp\377jki\377KLN\377BDG\377>\77E\377JMV" \
+  "\377\\`o\377\203\211\244\377\222\230\265\377\202\220\227\264\377\2\224" \
+  "\233\270\377\232\241\277\377\211\234\243\302\377\4|\201\232\377:;@\377" \
+  "vvs\377\343\343\331\377\241\354\354\341\377\6\351\351\336\377\211\212" \
+  "\205\37789=\377os\211\377\220\227\264\377\231\240\276\377\211\234\243" \
+  "\302\377\2\230\237\276\377\223\232\267\377\202\220\227\264\377\5\222" \
+  "\231\266\377\224\233\270\377\226\235\273\377\230\237\275\377\232\241" \
+  "\277\377\202\234\243\302\377\2\226\235\273\377\225\234\272\377\202\234" \
+  "\243\302\377\5\232\241\277\377\230\237\275\377\226\235\273\377\224\233" \
+  "\270\377\222\231\266\377\202\220\227\264\377\2\223\232\267\377\230\237" \
+  "\276\377\204\234\243\302\377\11\225\233\271\377OQ\\\377RRR\377\325\325" \
+  "\313\377\354\354\341\377\351\351\336\377\333\333\321\377\334\334\322" \
+  "\377\352\352\337\377\323\354\354\341\377\4\324\324\312\377YYY\377GJS" \
+  "\377\215\223\257\377\207\234\243\302\377\14\233\242\301\377\226\235\273" \
+  "\377\221\230\265\377\220\227\264\377\225\233\271\377\232\241\300\377" \
+  "\231\240\276\377fk}\377:;\77\377}~z\377\277\277\266\377\341\341\327\377" \
+  "\203\354\354\341\377\2\335\335\322\377\350\350\335\377\203\354\354\341" \
+  "\377\13\324\324\312\377\256\256\246\377TUU\377EGO\377\200\206\237\377" \
+  "\234\243\302\377\230\237\275\377\222\231\266\377\220\227\264\377\223" \
+  "\232\267\377\230\237\276\377\210\234\243\302\377\4pu\213\37789<\377\216" \
+  "\216\211\377\352\352\337\377\236\354\354\341\377\5\264\264\255\37789" \
+  ";\377afw\377\216\225\261\377\230\237\276\377\210\234\243\302\377\5\227" \
+  "\236\274\377\222\230\265\377\220\227\264\377\224\232\270\377\231\240" \
+  "\276\377\211\234\243\302\377\20\224\233\271\377\207\215\250\377~\204" \
+  "\235\377ot\213\377cfy\377W[h\377RU`\377X[i\377^br\377dh{\377ko\205\377" \
+  "qv\214\377\202\207\242\377\220\227\264\377\222\230\265\377\227\236\274" \
+  "\377\203\234\243\302\377\3\203\211\243\37767;\377\273\273\262\377\202" \
+  "\354\354\341\377\4\347\347\334\377\331\331\317\377\337\337\324\377\353" \
+  "\353\340\377\317\354\354\341\377\4\342\342\330\377nnl\377@BH\377\203" \
+  "\211\243\377\207\234\243\302\377\13\225\234\272\377\220\227\264\377\221" \
+  "\230\265\377\226\235\273\377\233\242\301\377\234\243\302\377\224\232" \
+  "\270\377Z^l\377<=@\377\225\225\220\377\350\350\335\377\206\354\354\341" \
+  "\377\2\335\335\322\377\350\350\335\377\206\354\354\341\377\4\323\323" \
+  "\311\377efe\377>@E\377sx\217\377\202\234\243\302\377\5\231\240\276\377" \
+  "\223\232\267\377\220\226\263\377\222\230\265\377\230\237\276\377\206" \
+  "\234\243\302\377\4\232\241\300\377ej{\377;;>\377\250\250\241\377\233" \
+  "\354\354\341\377\5\350\350\335\377oom\377CFO\377\210\217\252\377\227" \
+  "\235\273\377\207\234\243\302\377\5\227\235\273\377\221\230\265\377\220" \
+  "\227\264\377\225\233\271\377\232\241\300\377\210\234\243\302\377\33\222" \
+  "\231\266\377ot\213\377RU`\377;<A\377@AC\377YYY\377ttq\377\215\215\207" \
+  "\377\244\244\235\377\271\271\260\377\303\303\272\377\271\271\260\377" \
+  "\256\256\246\377\243\243\234\377\230\230\220\377\211\211\204\377aba\377" \
+  "CDE\377<=B\377GIR\377Z]n\377tz\220\377\226\234\272\377\234\243\302\377" \
+  "\225\233\271\3779;@\377\264\264\255\377\203\354\354\341\377\3\345\345" \
+  "\332\377\331\331\317\377\340\340\326\377\315\354\354\341\377\3\321\321" \
+  "\307\377<=>\377w|\223\377\207\234\243\302\377\3\226\235\273\377\217\226" \
+  "\262\377\226\235\273\377\204\234\243\302\377\3_cs\377ABD\377\252\252" \
+  "\243\377\211\354\354\341\377\2\335\335\322\377\350\350\335\377\210\354" \
+  "\354\341\377\4\337\337\324\377{{x\3779;\77\377\206\214\247\377\203\234" \
+  "\243\302\377\4\232\241\277\377\223\232\267\377\221\230\265\377\231\240" \
+  "\276\377\206\234\243\302\377\4\227\236\274\377RUa\377mnk\377\353\353" \
+  "\340\377\230\354\354\341\377\4\313\313\302\377;<>\377ei|\377\225\233" \
+  "\271\377\207\234\243\302\377\4\230\237\275\377\220\226\263\377\224\233" \
+  "\270\377\233\242\301\377\210\234\243\302\377\11\222\230\265\377^bs\377" \
+  "9:>\377MNN\377\207\207\202\377\302\302\271\377\352\352\337\377\343\343" \
+  "\331\377\342\342\330\377\215\354\354\341\377\11\323\323\311\377\245\245" \
+  "\236\377nnl\37788;\377BEM\377qw\215\377\225\233\271\3779:\77\377\334" \
+  "\334\322\377\204\354\354\341\377\3\341\341\327\377\332\332\320\377\353" \
+  "\353\340\377\312\354\354\341\377\3\266\266\256\37789>\377\214\223\256" \
+  "\377\206\234\243\302\377\3\227\236\274\377\217\226\262\377\225\233\271" \
+  "\377\204\234\243\302\377\3\227\236\274\377DFP\377}~{\377\213\354\354" \
+  "\341\377\2\335\335\322\377\350\350\335\377\212\354\354\341\377\3\330" \
+  "\330\316\377ABC\377qv\213\377\204\234\243\302\377\1\232\241\277\377\202" \
+  "\222\230\265\377\1\232\241\300\377\206\234\243\302\377\3ko\202\377MM" \
+  "M\377\341\341\327\377\226\354\354\341\377\4\234\234\227\3779;A\377\200" \
+  "\206\237\377\230\237\275\377\206\234\243\302\377\4\231\240\276\377\220" \
+  "\227\264\377\222\231\266\377\233\242\301\377\207\234\243\302\377\6\232" \
+  "\241\300\377pu\212\377@BI\377GHI\377\241\241\232\377\347\347\334\377" \
+  "\204\354\354\341\377\2\343\343\331\377\342\342\330\377\221\354\354\341" \
+  "\377\5\313\313\302\377rrp\37778:\377'(-\377^_^\377\205\354\354\341\377" \
+  "\3\346\346\333\377\330\330\316\377\351\351\336\377\310\354\354\341\377" \
+  "\3\222\222\215\377BDK\377\227\235\273\377\205\234\243\302\377\4\230\237" \
+  "\276\377\220\227\264\377\223\232\267\377\233\242\301\377\204\234\243" \
+  "\302\377\3\214\222\256\37778=\377\254\254\246\377\214\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\213\354\354\341\377\3\350\350\335" \
+  "\377aaa\377WZh\377\205\234\243\302\377\4\231\240\276\377\220\227\264" \
+  "\377\224\232\270\377\233\242\301\377\205\234\243\302\377\3}\203\233\377" \
+  ";<>\377\320\320\306\377\224\354\354\341\377\4\205\205\201\377GIS\377" \
+  "\215\223\260\377\232\241\277\377\205\234\243\302\377\4\232\241\300\377" \
+  "\222\230\265\377\221\230\265\377\232\241\300\377\210\234\243\302\377" \
+  "\4mr\207\37789=\377~\177{\377\327\327\315\377\207\354\354\341\377\2\343" \
+  "\343\331\377\342\342\330\377\223\354\354\341\377\4\352\352\337\377\303" \
+  "\303\271\377\257\257\246\377\352\352\337\377\205\354\354\341\377\3\351" \
+  "\351\336\377\330\330\316\377\345\345\332\377\305\354\354\341\377\3\352" \
+  "\352\337\377hig\377UXe\377\205\234\243\302\377\4\232\241\277\377\221" \
+  "\230\265\377\222\230\265\377\232\241\300\377\205\234\243\302\377\3y~" \
+  "\225\377:;=\377\317\317\305\377\215\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\215\354\354\341\377\3\220\221\214\377@BI\377\224\233" \
+  "\270\377\205\234\243\302\377\3\227\236\274\377\220\226\263\377\225\233" \
+  "\271\377\205\234\243\302\377\3\214\223\256\37789>\377\265\265\255\377" \
+  "\222\354\354\341\377\4llj\377SVb\377\220\226\263\377\233\242\301\377" \
+  "\204\234\243\302\377\4\233\242\301\377\223\232\267\377\220\227\264\377" \
+  "\231\240\276\377\210\234\243\302\377\4uz\222\3779;\77\377\177\177{\377" \
+  "\345\345\332\377\211\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\225\354\354\341\377\4\350\350\335\377\333\333\321\377\337\337\324\377" \
+  "\353\353\340\377\204\354\354\341\377\3\353\353\340\377\332\332\320\377" \
+  "\341\341\327\377\303\354\354\341\377\3\337\337\325\377IJJ\377lq\204\377" \
+  "\205\234\243\302\377\3\230\237\275\377\217\226\262\377\231\240\276\377" \
+  "\206\234\243\302\377\3jn\201\377QRQ\377\343\343\331\377\216\354\354\341" \
+  "\377\2\335\335\322\377\350\350\335\377\216\354\354\341\377\3\274\274" \
+  "\263\37768<\377\221\230\265\377\206\234\243\302\377\3\225\234\272\377" \
+  "\220\227\264\377\233\242\301\377\204\234\243\302\377\3\227\235\273\377" \
+  "BDK\377\221\221\214\377\217\354\354\341\377\4\352\352\337\377WXW\377" \
+  "^br\377\222\231\266\377\205\234\243\302\377\3\232\241\277\377\217\226" \
+  "\262\377\230\237\275\377\210\234\243\302\377\4\215\223\257\377=>E\377" \
+  "pqo\377\340\340\326\377\213\354\354\341\377\2\343\343\331\377\342\342" \
+  "\330\377\227\354\354\341\377\3\346\346\333\377\331\331\317\377\351\351" \
+  "\336\377\205\354\354\341\377\2\337\337\324\377\335\335\322\377\301\354" \
+  "\354\341\377\3\315\315\303\3779:<\377~\203\234\377\205\234\243\302\377" \
+  "\3\225\234\272\377\221\230\265\377\233\242\301\377\206\234\243\302\377" \
+  "\3z\200\230\377GGH\377\352\352\337\377\217\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\217\354\354\341\377\3\304\304\273\377:;A\377" \
+  "\231\240\276\377\206\234\243\302\377\3\230\237\276\377\217\226\262\377" \
+  "\232\241\277\377\205\234\243\302\377\3UXe\377ghf\377\353\353\340\377" \
+  "\215\354\354\341\377\3]]\\\377bgx\377\225\234\272\377\205\234\243\302" \
+  "\377\3\230\237\275\377\220\226\263\377\232\241\300\377\210\234\243\302" \
+  "\377\3mr\206\37789;\377\306\306\274\377\215\354\354\341\377\2\343\343" \
+  "\331\377\342\342\330\377\230\354\354\341\377\3\352\352\337\377\331\331" \
+  "\317\377\346\346\333\377\205\354\354\341\377\3\343\343\331\377\331\331" \
+  "\317\377\352\352\337\377\276\354\354\341\377\3\331\331\317\377346\377" \
+  "\215\223\257\377\205\234\243\302\377\2\222\231\266\377\224\232\270\377" \
+  "\207\234\243\302\377\3\214\222\256\377569\377\337\337\325\377\220\354" \
+  "\354\341\377\2\335\335\322\377\350\350\335\377\220\354\354\341\377\2" \
+  "\243\243\235\377JLV\377\207\234\243\302\377\3\232\241\300\377\217\226" \
+  "\262\377\230\237\275\377\205\234\243\302\377\2fj|\377klj\377\214\354" \
+  "\354\341\377\3qro\377W[i\377\230\237\275\377\205\234\243\302\377\3\225" \
+  "\234\272\377\221\230\265\377\233\242\301\377\207\234\243\302\377\4\225" \
+  "\234\272\377FHR\377jjh\377\347\347\334\377\216\354\354\341\377\2\343" \
+  "\343\331\377\342\342\330\377\231\354\354\341\377\3\353\353\340\377\334" \
+  "\334\322\377\341\341\327\377\205\354\354\341\377\2\346\346\333\377\331" \
+  "\331\317\377\275\354\354\341\377\3\347\347\334\377>\77\77\377\202\210" \
+  "\242\377\204\234\243\302\377\3\233\242\301\377\220\226\263\377\227\235" \
+  "\273\377\207\234\243\302\377\3\227\235\273\37756:\377\314\314\303\377" \
+  "\221\354\354\341\377\2\335\335\322\377\350\350\335\377\221\354\354\341" \
+  "\377\2xyv\377adu\377\207\234\243\302\377\3\233\242\301\377\221\230\265" \
+  "\377\225\234\272\377\205\234\243\302\377\2QTa\377\225\226\221\377\212" \
+  "\354\354\341\377\3\207\207\203\377KNZ\377\225\234\272\377\205\234\243" \
+  "\302\377\2\222\231\266\377\224\232\270\377\210\234\243\302\377\3\211" \
+  "\217\252\37778<\377\262\262\253\377\220\354\354\341\377\2\343\343\331" \
+  "\377\342\342\330\377\233\354\354\341\377\2\337\337\325\377\336\336\323" \
+  "\377\205\354\354\341\377\2\343\343\331\377\335\335\322\377\274\354\354" \
+  "\341\377\2Z[Z\377pt\211\377\204\234\243\302\377\3\231\240\276\377\217" \
+  "\226\262\377\230\237\276\377\210\234\243\302\377\2BDL\377\256\256\246" \
+  "\377\222\354\354\341\377\2\335\335\322\377\350\350\335\377\222\354\354" \
+  "\341\377\2RRR\377v{\222\377\210\234\243\302\377\2\224\232\270\377\222" \
+  "\231\266\377\204\234\243\302\377\3\233\242\301\377>@G\377\272\272\261" \
+  "\377\210\354\354\341\377\3\260\260\250\377@BJ\377\222\231\266\377\204" \
+  "\234\243\302\377\3\233\242\301\377\220\227\264\377\227\235\273\377\210" \
+  "\234\243\302\377\3\177\205\237\377<=\77\377\327\327\315\377\221\354\354" \
+  "\341\377\2\343\343\331\377\342\342\330\377\234\354\354\341\377\3\344" \
+  "\344\331\377\332\332\320\377\353\353\340\377\204\354\354\341\377\2\337" \
+  "\337\324\377\341\341\327\377\272\354\354\341\377\2\204\204\200\377X[" \
+  "i\377\204\234\243\302\377\3\230\237\276\377\217\226\262\377\232\241\300" \
+  "\377\210\234\243\302\377\2Y\\j\377\206\206\202\377\223\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\222\354\354\341\377\3\344\344\331" \
+  "\377;<>\377\207\215\250\377\210\234\243\302\377\2\227\235\273\377\220" \
+  "\227\264\377\204\234\243\302\377\3\225\233\271\37767;\377\323\323\312" \
+  "\377\206\354\354\341\377\3\341\341\327\377458\377\212\221\255\377\204" \
+  "\234\243\302\377\3\232\241\300\377\217\226\262\377\231\240\276\377\210" \
+  "\234\243\302\377\3v{\221\377DDE\377\337\337\325\377\222\354\354\341\377" \
+  "\2\343\343\331\377\342\342\330\377\235\354\354\341\377\3\350\350\335" \
+  "\377\331\331\317\377\352\352\337\377\204\354\354\341\377\2\333\333\321" \
+  "\377\346\346\333\377\270\354\354\341\377\2\255\255\246\377BDL\377\204" \
+  "\234\243\302\377\3\232\241\300\377\217\226\262\377\233\242\301\377\210" \
+  "\234\243\302\377\2\205\213\246\377MMM\377\224\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\223\354\354\341\377\2\322\322\310\377;=C\377" \
+  "\211\234\243\302\377\2\226\235\273\377\222\231\266\377\204\234\243\302" \
+  "\377\3\211\217\252\377<<>\377\344\344\331\377\205\354\354\341\377\3[" \
+  "[Z\377os\210\377\233\242\301\377\204\234\243\302\377\2\220\226\263\377" \
+  "\231\240\276\377\210\234\243\302\377\3mr\205\377PPP\377\346\346\333\377" \
+  "\223\354\354\341\377\2\343\343\331\377\342\342\330\377\236\354\354\341" \
+  "\377\2\350\350\335\377\332\332\320\377\204\354\354\341\377\3\353\353" \
+  "\340\377\330\330\316\377\351\351\336\377\266\354\354\341\377\3\314\314" \
+  "\303\37757;\377\227\236\274\377\204\234\243\302\377\2\217\226\262\377" \
+  "\231\240\276\377\211\234\243\302\377\2=\77E\377\317\317\305\377\216\354" \
+  "\354\341\377\15\353\353\340\377\350\350\335\377\345\345\332\377\342\342" \
+  "\330\377\337\337\325\377\335\335\322\377\314\314\302\377\327\327\315" \
+  "\377\336\336\323\377\340\340\326\377\343\343\331\377\346\346\333\377" \
+  "\351\351\336\377\217\354\354\341\377\2opn\377rw\215\377\211\234\243\302" \
+  "\377\2\223\232\267\377\225\234\272\377\204\234\243\302\377\2w|\223\377" \
+  "QRQ\377\204\354\354\341\377\3\253\253\244\377FIS\377\232\241\277\377" \
+  "\204\234\243\302\377\2\222\230\265\377\227\235\273\377\210\234\243\302" \
+  "\377\3v|\222\377NOO\377\352\352\337\377\217\354\354\341\377\14\351\351" \
+  "\336\377\346\346\333\377\343\343\331\377\340\340\326\377\336\336\323" \
+  "\377\323\323\311\377\322\322\310\377\336\336\323\377\340\340\326\377" \
+  "\343\343\331\377\346\346\333\377\351\351\336\377\232\354\354\341\377" \
+  "\2\344\344\331\377\335\335\322\377\204\354\354\341\377\3\351\351\336" \
+  "\377\330\330\316\377\353\353\340\377\264\354\354\341\377\3\337\337\325" \
+  "\377679\377\214\223\256\377\204\234\243\302\377\2\222\230\265\377\227" \
+  "\236\274\377\211\234\243\302\377\2tz\221\377iig\377\214\354\354\341\377" \
+  "\23\352\352\337\377\341\341\327\377\332\332\320\377\331\331\317\377\335" \
+  "\335\322\377\337\337\325\377\342\342\330\377\345\345\332\377\350\350" \
+  "\335\377\334\334\321\377\346\346\333\377\347\347\334\377\344\344\331" \
+  "\377\341\341\327\377\337\337\324\377\333\333\321\377\330\330\316\377" \
+  "\335\335\322\377\345\345\332\377\214\354\354\341\377\3\342\342\330\377" \
+  "67;\377\232\241\300\377\211\234\243\302\377\2\220\227\264\377\230\237" \
+  "\275\377\204\234\243\302\377\2afv\377vvt\377\202\354\354\341\377\3\337" \
+  "\337\325\377235\377\223\231\266\377\204\234\243\302\377\2\225\233\271" \
+  "\377\224\233\270\377\210\234\243\302\377\3\200\206\237\377ABC\377\345" \
+  "\345\332\377\214\354\354\341\377\24\353\353\340\377\343\343\331\377\333" \
+  "\333\321\377\330\330\316\377\334\334\322\377\337\337\324\377\342\342" \
+  "\330\377\345\345\332\377\350\350\335\377\342\342\330\377\341\341\327" \
+  "\377\350\350\335\377\345\345\332\377\342\342\330\377\337\337\324\377" \
+  "\334\334\322\377\330\330\316\377\333\333\321\377\343\343\331\377\353" \
+  "\353\340\377\227\354\354\341\377\2\340\340\326\377\341\341\327\377\204" \
+  "\354\354\341\377\2\346\346\333\377\333\333\321\377\264\354\354\341\377" \
+  "\2TUU\377|\201\232\377\204\234\243\302\377\202\224\233\270\377\211\234" \
+  "\243\302\377\3\232\241\300\37756:\377\337\337\325\377\211\354\354\341" \
+  "\377\6\353\353\340\377\337\337\325\377\331\331\317\377\332\332\320\377" \
+  "\342\342\330\377\352\352\337\377\206\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\206\354\354\341\377\5\347\347\334\377\337\337\324\377" \
+  "\330\330\316\377\333\333\321\377\344\344\331\377\212\354\354\341\377" \
+  "\2\221\221\214\377bfw\377\211\234\243\302\377\3\233\242\301\377\217\226" \
+  "\262\377\232\241\277\377\204\234\243\302\377\5FIR\377\265\265\255\377" \
+  "\354\354\341\377TTS\377tz\221\377\204\234\243\302\377\2\230\237\275\377" \
+  "\221\230\265\377\210\234\243\302\377\3\211\217\253\3779:<\377\336\336" \
+  "\323\377\213\354\354\341\377\5\342\342\330\377\332\332\320\377\331\331" \
+  "\317\377\340\340\326\377\351\351\336\377\206\354\354\341\377\2\343\343" \
+  "\331\377\342\342\330\377\206\354\354\341\377\5\351\351\336\377\340\340" \
+  "\326\377\331\331\317\377\332\332\320\377\342\342\330\377\226\354\354" \
+  "\341\377\2\334\334\322\377\346\346\333\377\204\354\354\341\377\2\341" \
+  "\341\327\377\337\337\325\377\262\354\354\341\377\2\300\300\267\377GJ" \
+  "S\377\204\234\243\302\377\2\227\236\274\377\221\230\265\377\212\234\243" \
+  "\302\377\2chy\377\211\211\205\377\211\354\354\341\377\4\340\340\326\377" \
+  "\330\330\316\377\343\343\331\377\353\353\340\377\211\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\211\354\354\341\377\4\351\351\336" \
+  "\377\336\336\323\377\331\331\317\377\347\347\334\377\210\354\354\341" \
+  "\377\3\353\353\340\377:;>\377\224\233\270\377\211\234\243\302\377\3\232" \
+  "\241\277\377\217\226\262\377\233\242\301\377\203\234\243\302\377\4\221" \
+  "\230\265\377=>@\377\246\246\237\377ILV\377\204\234\243\302\377\2\232" \
+  "\241\277\377\217\226\262\377\210\234\243\302\377\3\227\235\273\37789" \
+  "<\377\323\323\312\377\212\354\354\341\377\4\344\344\331\377\330\330\316" \
+  "\377\340\340\326\377\352\352\337\377\211\354\354\341\377\2\343\343\331" \
+  "\377\342\342\330\377\211\354\354\341\377\4\352\352\337\377\340\340\326" \
+  "\377\330\330\316\377\344\344\331\377\225\354\354\341\377\2\331\331\317" \
+  "\377\351\351\336\377\204\354\354\341\377\2\330\330\316\377\352\352\337" \
+  "\377\261\354\354\341\377\2DEF\377\215\223\257\377\203\234\243\302\377" \
+  "\2\232\241\277\377\217\226\262\377\212\234\243\302\377\3\225\233\271" \
+  "\377679\377\351\351\336\377\207\354\354\341\377\3\343\343\331\377\330" \
+  "\330\316\377\342\342\330\377\214\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\213\354\354\341\377\4\351\351\336\377\334\334\322\377\333" \
+  "\333\321\377\351\351\336\377\207\354\354\341\377\2\261\261\251\377QT" \
+  "a\377\212\234\243\302\377\2\230\237\275\377\220\227\264\377\204\234\243" \
+  "\302\377\3RVd\377)*.\377\223\232\267\377\203\234\243\302\377\3\233\242" \
+  "\301\377\217\226\262\377\232\241\300\377\210\234\243\302\377\2KMW\377" \
+  "\262\262\252\377\211\354\354\341\377\4\346\346\333\377\331\331\317\377" \
+  "\337\337\324\377\353\353\340\377\213\354\354\341\377\2\343\343\331\377" \
+  "\342\342\330\377\213\354\354\341\377\4\353\353\340\377\337\337\324\377" \
+  "\331\331\317\377\346\346\333\377\223\354\354\341\377\3\352\352\337\377" \
+  "\331\331\317\377\353\353\340\377\203\354\354\341\377\2\345\345\332\377" \
+  "\335\335\322\377\260\354\354\341\377\2\256\256\246\377RTa\377\204\234" \
+  "\243\302\377\2\220\226\263\377\232\241\300\377\212\234\243\302\377\2" \
+  "Y\\k\377\247\247\240\377\206\354\354\341\377\4\350\350\335\377\331\331" \
+  "\317\377\337\337\325\377\353\353\340\377\215\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\215\354\354\341\377\3\350\350\335\377\332\332" \
+  "\320\377\337\337\324\377\207\354\354\341\377\2HIJ\377\220\226\263\377" \
+  "\212\234\243\302\377\2\224\233\270\377\226\235\273\377\203\234\243\302" \
+  "\377\2GJW\377os\211\377\204\234\243\302\377\2\222\231\266\377\230\237" \
+  "\275\377\210\234\243\302\377\2ot\211\377klj\377\210\354\354\341\377\4" \
+  "\353\353\340\377\333\333\321\377\334\334\322\377\352\352\337\377\215" \
+  "\354\354\341\377\2\343\343\331\377\342\342\330\377\215\354\354\341\377" \
+  "\4\352\352\337\377\335\335\322\377\333\333\321\377\353\353\340\377\222" \
+  "\354\354\341\377\2\346\346\333\377\336\336\323\377\204\354\354\341\377" \
+  "\2\331\331\317\377\351\351\336\377\256\354\354\341\377\3\353\353\340" \
+  "\377;<>\377\224\232\270\377\203\234\243\302\377\2\227\235\273\377\224" \
+  "\232\270\377\213\234\243\302\377\1:;>\377\206\354\354\341\377\3\345\345" \
+  "\332\377\330\330\316\377\351\351\336\377\217\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\217\354\354\341\377\3\342\342\330\377\332\332" \
+  "\320\377\353\353\340\377\205\354\354\341\377\2\251\251\242\377]ap\377" \
+  "\213\234\243\302\377\1\217\226\262\377\202\234\243\302\377\3\226\235" \
+  "\273\377+-7\377\230\237\276\377\203\234\243\302\377\2\232\241\277\377" \
+  "\220\227\264\377\210\234\243\302\377\3\215\223\257\377;<>\377\350\350" \
+  "\335\377\207\354\354\341\377\3\341\341\326\377\276\276\265\377\342\342" \
+  "\327\377\217\354\354\341\377\2\343\343\331\377\342\342\330\377\217\354" \
+  "\354\341\377\3\346\346\333\377\330\330\316\377\350\350\335\377\222\354" \
+  "\354\341\377\2\333\333\321\377\351\351\336\377\203\354\354\341\377\2" \
+  "\347\347\334\377\333\333\321\377\256\354\354\341\377\2\231\231\223\377" \
+  "\\`p\377\204\234\243\302\377\2\217\226\262\377\233\242\301\377\212\234" \
+  "\243\302\377\2|\202\233\377oom\377\205\354\354\341\377\3\340\340\326" \
+  "\377\333\333\321\377\353\353\340\377\220\354\354\341\377\2\335\335\322" \
+  "\377\350\350\335\377\220\354\354\341\377\3\346\346\333\377\330\330\316" \
+  "\377\350\350\335\377\204\354\354\341\377\2\352\352\337\377:;\77\377\213" \
+  "\234\243\302\377\5\226\235\273\377\224\233\270\377\234\243\302\377Z_" \
+  "q\377`ex\377\204\234\243\302\377\2\221\230\265\377\231\240\276\377\210" \
+  "\234\243\302\377\2>@G\377\311\311\300\377\207\354\354\341\377\10\345" \
+  "\345\332\377\266\266\255\377\14\14\15\377./4\377@BF\377ABE\377iig\377" \
+  "\307\307\276\377\213\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\220\354\354\341\377\3\351\351\336\377\330\330\316\377\345\345\332\377" \
+  "\221\354\354\341\377\2\351\351\336\377\334\334\322\377\204\354\354\341" \
+  "\377\2\333\333\321\377\347\347\334\377\254\354\354\341\377\3\347\347" \
+  "\334\37767:\377\230\237\276\377\203\234\243\302\377\2\225\234\272\377" \
+  "\225\233\271\377\213\234\243\302\377\2JLV\377\313\313\302\377\204\354" \
+  "\354\341\377\2\335\335\322\377\337\337\324\377\222\354\354\341\377\2" \
+  "\335\335\322\377\350\350\335\377\221\354\354\341\377\3\351\351\336\377" \
+  "\330\330\316\377\345\345\332\377\204\354\354\341\377\2ded\377\202\210" \
+  "\242\377\213\234\243\302\377\4\217\226\262\377\232\241\300\377')1\377" \
+  "\230\237\274\377\203\234\243\302\377\2\231\240\276\377\222\230\265\377" \
+  "\210\234\243\302\377\2v|\222\377hig\377\207\354\354\341\377\14\340\340" \
+  "\326\377\332\332\320\377\353\353\340\377\315\315\303\37799;\377v{\222" \
+  "\377\234\243\302\377~\204\235\377KNW\377>\77A\377\220\220\213\377\353" \
+  "\353\340\377\210\354\354\341\377\2\343\343\331\377\342\342\330\377\221" \
+  "\354\354\341\377\3\353\353\340\377\332\332\320\377\340\340\326\377\221" \
+  "\354\354\341\377\2\335\335\322\377\350\350\335\377\203\354\354\341\377" \
+  "\2\351\351\336\377\331\331\317\377\254\354\354\341\377\2\205\205\201" \
+  "\377hl\177\377\203\234\243\302\377\2\233\242\301\377\217\226\262\377" \
+  "\213\234\243\302\377\2\230\237\276\377>\77A\377\204\354\354\341\377\2" \
+  "\333\333\321\377\343\343\331\377\223\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\222\354\354\341\377\3\353\353\340\377\332\332\320\377" \
+  "\346\346\333\377\203\354\354\341\377\2\303\303\272\377NP\\\377\213\234" \
+  "\243\302\377\3\227\236\274\377ei}\377OSc\377\204\234\243\302\377\2\220" \
+  "\227\264\377\232\241\300\377\207\234\243\302\377\3\233\242\301\37768" \
+  "<\377\337\337\325\377\206\354\354\341\377\2\340\340\326\377\336\336\323" \
+  "\377\203\354\354\341\377\3\344\344\331\377VWV\377[^l\377\202\234\243" \
+  "\302\377\4\230\237\276\377cgx\377@AC\377\313\313\302\377\207\354\354" \
+  "\341\377\2\343\343\331\377\342\342\330\377\223\354\354\341\377\2\336" \
+  "\336\323\377\340\340\326\377\220\354\354\341\377\2\352\352\337\377\333" \
+  "\333\321\377\204\354\354\341\377\2\335\335\322\377\345\345\332\377\252" \
+  "\354\354\341\377\3\341\341\327\37767;\377\233\242\301\377\203\234\243" \
+  "\302\377\2\224\232\270\377\227\235\273\377\213\234\243\302\377\2kp\205" \
+  "\377\212\212\205\377\203\354\354\341\377\2\337\337\325\377\340\340\326" \
+  "\377\224\354\354\341\377\2\335\335\322\377\350\350\335\377\223\354\354" \
+  "\341\377\3\353\353\340\377\330\330\316\377\351\351\336\377\203\354\354" \
+  "\341\377\2:;>\377\232\241\277\377\213\234\243\302\377\2)+3\377\216\225" \
+  "\262\377\203\234\243\302\377\2\230\237\275\377\223\232\267\377\210\234" \
+  "\243\302\377\2ei{\377\210\211\204\377\206\354\354\341\377\2\345\345\332" \
+  "\377\333\333\321\377\206\354\354\341\377\2ttq\377]ap\377\203\234\243" \
+  "\302\377\4\214\223\256\377@BH\377\202\203\177\377\353\353\340\377\205" \
+  "\354\354\341\377\2\343\343\331\377\342\342\330\377\224\354\354\341\377" \
+  "\2\333\333\321\377\345\345\332\377\220\354\354\341\377\2\337\337\324" \
+  "\377\346\346\333\377\203\354\354\341\377\2\352\352\337\377\330\330\316" \
+  "\377\252\354\354\341\377\2\232\232\223\377im\201\377\203\234\243\302" \
+  "\377\2\232\241\300\377\220\226\263\377\214\234\243\302\377\2>@F\377\335" \
+  "\335\322\377\202\354\354\341\377\2\344\344\331\377\334\334\322\377\225" \
+  "\354\354\341\377\2\335\335\322\377\350\350\335\377\224\354\354\341\377" \
+  "\3\351\351\336\377\330\330\316\377\353\353\340\377\202\354\354\341\377" \
+  "\2\177\200|\377pu\213\377\212\234\243\302\377\3~\203\235\377<\77K\377" \
+  "\222\230\265\377\203\234\243\302\377\2\217\226\262\377\233\242\301\377" \
+  "\207\234\243\302\377\3\226\235\273\37789;\377\351\351\336\377\205\354" \
+  "\354\341\377\3\350\350\335\377\330\330\316\377\353\353\340\377\207\354" \
+  "\354\341\377\2XXX\377ot\211\377\204\234\243\302\377\3chx\377]^\\\377" \
+  "\353\353\340\377\204\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\224\354\354\341\377\3\353\353\340\377\330\330\316\377\350\350\335\377" \
+  "\217\354\354\341\377\2\353\353\340\377\332\332\320\377\204\354\354\341" \
+  "\377\2\334\334\322\377\350\350\335\377\251\354\354\341\377\2OPP\377\224" \
+  "\232\270\377\203\234\243\302\377\2\222\231\266\377\230\237\275\377\213" \
+  "\234\243\302\377\2\217\226\262\377KLL\377\202\354\354\341\377\2\350\350" \
+  "\335\377\331\331\317\377\226\354\354\341\377\2\335\335\322\377\350\350" \
+  "\335\377\225\354\354\341\377\2\346\346\333\377\332\332\320\377\202\354" \
+  "\354\341\377\2\327\327\315\377ACI\377\212\234\243\302\377\7""9<H\377" \
+  "\201\207\241\377\221\230\265\377\232\241\277\377\234\243\302\377\227" \
+  "\235\273\377\224\233\270\377\210\234\243\302\377\2afw\377\223\223\215" \
+  "\377\205\354\354\341\377\3\353\353\340\377\330\330\316\377\351\351\336" \
+  "\377\210\354\354\341\377\3\350\350\335\377BCC\377~\204\235\377\204\234" \
+  "\243\302\377\3hl~\377]^\\\377\353\353\340\377\203\354\354\341\377\2\343" \
+  "\343\331\377\342\342\330\377\225\354\354\341\377\3\351\351\336\377\330" \
+  "\330\316\377\353\353\340\377\217\354\354\341\377\2\341\341\327\377\344" \
+  "\344\331\377\203\354\354\341\377\2\345\345\332\377\337\337\324\377\250" \
+  "\354\354\341\377\2\347\347\334\377\77AF\377\204\234\243\302\377\1\220" \
+  "\227\264\377\214\234\243\302\377\6in\202\377\225\225\220\377\354\354" \
+  "\341\377\353\353\340\377\330\330\316\377\352\352\337\377\226\354\354" \
+  "\341\377\2\335\335\322\377\350\350\335\377\226\354\354\341\377\2\341" \
+  "\341\327\377\337\337\324\377\202\354\354\341\377\1@AC\377\211\234\243" \
+  "\302\377\10\222\231\266\377.0:\377\234\243\302\377\230\237\276\377\224" \
+  "\232\270\377\234\243\302\377\220\227\264\377\233\242\301\377\210\234" \
+  "\243\302\377\2""57:\377\346\346\333\377\205\354\354\341\377\2\332\332" \
+  "\320\377\346\346\333\377\212\354\354\341\377\3\336\336\323\377569\377" \
+  "\230\237\276\377\204\234\243\302\377\2hl~\377_`^\377\203\354\354\341" \
+  "\377\2\343\343\331\377\342\342\330\377\226\354\354\341\377\2\346\346" \
+  "\333\377\332\332\320\377\217\354\354\341\377\2\353\353\340\377\333\333" \
+  "\321\377\204\354\354\341\377\1\330\330\316\377\250\354\354\341\377\2" \
+  "\252\252\242\377_dt\377\203\234\243\302\377\2\230\237\276\377\224\232" \
+  "\270\377\214\234\243\302\377\5NQ[\377\313\313\302\377\354\354\341\377" \
+  "\337\337\324\377\344\344\331\377\227\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\227\354\354\341\377\5\331\331\317\377\351\351\336\377" \
+  "\354\354\341\377bba\377\207\215\250\377\210\234\243\302\377\2kp\204\377" \
+  "UZj\377\202\234\243\302\377\3\220\227\264\377\233\242\301\377\220\227" \
+  "\264\377\210\234\243\302\377\2w|\224\377ppn\377\205\354\354\341\377\2" \
+  "\345\345\332\377\336\336\323\377\214\354\354\341\377\2\231\231\223\377" \
+  "[^m\377\205\234\243\302\377\2[_m\377\226\226\221\377\202\354\354\341" \
+  "\377\2\343\343\331\377\342\342\330\377\227\354\354\341\377\2\336\336" \
+  "\323\377\344\344\331\377\217\354\354\341\377\2\333\333\321\377\353\353" \
+  "\340\377\203\354\354\341\377\2\333\333\321\377\352\352\337\377\247\354" \
+  "\354\341\377\2Z[Z\377\214\222\256\377\203\234\243\302\377\2\223\232\267" \
+  "\377\231\240\276\377\214\234\243\302\377\4<>B\377\354\354\341\377\352" \
+  "\352\337\377\331\331\317\377\230\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\227\354\354\341\377\5\347\347\334\377\333\333\321\377\354" \
+  "\354\341\377\232\232\223\377hl\177\377\210\234\243\302\377\2ACQ\377\177" \
+  "\205\236\377\202\234\243\302\377\3\222\230\265\377\225\233\271\377\225" \
+  "\234\272\377\210\234\243\302\377\2ACI\377\326\326\314\377\205\354\354" \
+  "\341\377\2\330\330\316\377\353\353\340\377\215\354\354\341\377\2\77\77" \
+  "A\377\217\225\262\377\204\234\243\302\377\6\233\242\301\3779:\77\377" \
+  "\323\323\311\377\354\354\341\377\343\343\331\377\342\342\330\377\227" \
+  "\354\354\341\377\2\353\353\340\377\330\330\316\377\217\354\354\341\377" \
+  "\2\342\342\330\377\344\344\331\377\203\354\354\341\377\2\342\342\330" \
+  "\377\340\340\326\377\246\354\354\341\377\2\353\353\340\377<=A\377\204" \
+  "\234\243\302\377\1\220\226\263\377\214\234\243\302\377\5\232\241\277" \
+  "\377DEG\377\354\354\341\377\335\335\322\377\346\346\333\377\230\354\354" \
+  "\341\377\2\335\335\322\377\350\350\335\377\230\354\354\341\377\4\333" \
+  "\333\321\377\350\350\335\377\316\316\304\377MPY\377\210\234\243\302\377" \
+  "\2)+4\377\233\242\301\377\202\234\243\302\377\3\227\235\273\377\213\221" \
+  "\255\377\232\241\300\377\207\234\243\302\377\2\223\232\267\377KLM\377" \
+  "\205\354\354\341\377\2\342\342\330\377\340\340\326\377\216\354\354\341" \
+  "\377\2\277\277\266\377HKT\377\205\234\243\302\377\5\207\215\250\377B" \
+  "CD\377\353\353\340\377\343\343\331\377\342\342\330\377\230\354\354\341" \
+  "\377\2\340\340\326\377\341\341\327\377\216\354\354\341\377\2\352\352" \
+  "\337\377\335\335\322\377\203\354\354\341\377\2\353\353\340\377\331\331" \
+  "\317\377\246\354\354\341\377\2\272\272\261\377VYf\377\203\234\243\302" \
+  "\377\2\232\241\277\377\222\230\265\377\214\234\243\302\377\4\177\204" \
+  "\236\377pqo\377\351\351\336\377\333\333\321\377\231\354\354\341\377\2" \
+  "\335\335\322\377\350\350\335\377\230\354\354\341\377\4\350\350\335\377" \
+  "\332\332\320\377\354\354\341\377=>B\377\207\234\243\302\377\2\216\224" \
+  "\261\37769C\377\204\234\243\302\377\1\205\214\247\377\210\234\243\302" \
+  "\377\2hm\201\377\227\227\221\377\205\354\354\341\377\1\330\330\316\377" \
+  "\220\354\354\341\377\2IJK\377\222\231\266\377\205\234\243\302\377\4^" \
+  "br\377\223\223\216\377\343\343\331\377\342\342\330\377\231\354\354\341" \
+  "\377\2\327\327\315\377\353\353\340\377\216\354\354\341\377\1\333\333" \
+  "\321\377\204\354\354\341\377\2\331\331\317\377\353\353\340\377\245\354" \
+  "\354\341\377\2ijh\377\201\206\240\377\203\234\243\302\377\2\224\233\270" \
+  "\377\230\237\275\377\214\234\243\302\377\4`du\377\252\252\242\377\333" \
+  "\333\321\377\350\350\335\377\231\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\231\354\354\341\377\4\335\335\322\377\346\346\333\377FF" \
+  "H\377\232\241\277\377\206\234\243\302\377\2dh|\377^bu\377\203\234\243" \
+  "\302\377\3\230\237\275\377\211\217\253\377\233\242\301\377\207\234\243" \
+  "\302\377\2DEM\377\336\336\323\377\204\354\354\341\377\2\340\340\326\377" \
+  "\342\342\330\377\220\354\354\341\377\2\246\246\236\377^bq\377\205\234" \
+  "\243\302\377\2\232\241\277\377<<\77\377\202\342\342\330\377\231\354\354" \
+  "\341\377\2\342\342\330\377\340\340\326\377\216\354\354\341\377\2\340" \
+  "\340\326\377\346\346\333\377\203\354\354\341\377\2\340\340\326\377\343" \
+  "\343\331\377\245\354\354\341\377\1;;>\377\204\234\243\302\377\1\220\226" \
+  "\263\377\215\234\243\302\377\3DFN\377\334\334\321\377\331\331\317\377" \
+  "\232\354\354\341\377\2\335\335\322\377\350\350\335\377\231\354\354\341" \
+  "\377\4\350\350\335\377\334\334\322\377rrp\377\177\204\236\377\206\234" \
+  "\243\302\377\2:=I\377\212\220\253\377\203\234\243\302\377\3\222\231\266" \
+  "\377\223\232\267\377\226\235\273\377\206\234\243\302\377\2\232\241\277" \
+  "\377DEG\377\205\354\354\341\377\1\331\331\317\377\221\354\354\341\377" \
+  "\2\351\351\336\37778<\377\206\234\243\302\377\3]ap\377\237\237\230\377" \
+  "\342\342\330\377\232\354\354\341\377\1\331\331\317\377\216\354\354\341" \
+  "\377\2\351\351\336\377\336\336\323\377\203\354\354\341\377\2\351\351" \
+  "\336\377\333\333\321\377\244\354\354\341\377\2\331\331\317\377FHP\377" \
+  "\203\234\243\302\377\2\232\241\300\377\221\230\265\377\215\234\243\302" \
+  "\377\3>\77B\377\344\344\331\377\340\340\326\377\232\354\354\341\377\2" \
+  "\335\335\322\377\350\350\335\377\232\354\354\341\377\3\330\330\316\377" \
+  "\252\252\242\377aev\377\206\234\243\302\377\1+-6\377\204\234\243\302" \
+  "\377\3\220\227\264\377\233\242\301\377\220\227\264\377\206\234\243\302" \
+  "\377\2tz\221\377\202\202~\377\204\354\354\341\377\2\352\352\337\377\333" \
+  "\333\321\377\222\354\354\341\377\2ggf\377\177\205\237\377\205\234\243" \
+  "\302\377\3\225\233\271\377<=>\377\342\342\330\377\232\354\354\341\377" \
+  "\2\333\333\321\377\352\352\337\377\216\354\354\341\377\1\333\333\321" \
+  "\377\204\354\354\341\377\1\331\331\317\377\244\354\354\341\377\2\265" \
+  "\265\254\377[^l\377\203\234\243\302\377\2\227\236\274\377\225\233\271" \
+  "\377\214\234\243\302\377\4\231\240\276\377DEF\377\334\334\322\377\351" \
+  "\351\336\377\232\354\354\341\377\2\335\335\322\377\350\350\335\377\232" \
+  "\354\354\341\377\3\335\335\322\377\320\320\307\377KMU\377\205\234\243" \
+  "\302\377\2\213\221\255\377:=I\377\203\234\243\302\377\4\232\241\300\377" \
+  "\222\230\265\377\234\243\302\377\220\227\264\377\206\234\243\302\377" \
+  "\2TWd\377\272\272\261\377\204\354\354\341\377\2\341\341\327\377\343\343" \
+  "\331\377\222\354\354\341\377\2\246\246\236\377]aq\377\206\234\243\302" \
+  "\377\2JLV\377\277\277\266\377\232\354\354\341\377\2\343\343\331\377\341" \
+  "\341\327\377\216\354\354\341\377\2\335\335\322\377\352\352\337\377\203" \
+  "\354\354\341\377\2\332\332\320\377\353\353\340\377\243\354\354\341\377" \
+  "\2\217\220\212\377ns\211\377\203\234\243\302\377\2\225\234\272\377\227" \
+  "\236\274\377\214\234\243\302\377\3\217\226\262\377STT\377\330\330\316" \
+  "\377\233\354\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354" \
+  "\341\377\3\345\345\332\377\333\333\320\377@BH\377\205\234\243\302\377" \
+  "\2sx\217\377TXi\377\203\234\243\302\377\4\230\237\276\377\224\232\270" \
+  "\377\234\243\302\377\220\227\264\377\206\234\243\302\377\2>\77E\377\343" \
+  "\343\331\377\204\354\354\341\377\2\332\332\320\377\353\353\340\377\222" \
+  "\354\354\341\377\2\333\333\321\377@BI\377\206\234\243\302\377\2ns\211" \
+  "\377}~z\377\232\354\354\341\377\2\353\353\340\377\332\332\320\377\216" \
+  "\354\354\341\377\2\337\337\325\377\347\347\334\377\203\354\354\341\377" \
+  "\2\336\336\323\377\347\347\334\377\243\354\354\341\377\2ggf\377\207\215" \
+  "\250\377\203\234\243\302\377\2\223\232\267\377\231\240\276\377\214\234" \
+  "\243\302\377\3\205\213\245\377bcb\377\336\336\323\377\233\354\354\341" \
+  "\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2\330\330" \
+  "\316\377\77@E\377\205\234\243\302\377\2dh|\377ch|\377\203\234\243\302" \
+  "\377\5\227\235\273\377\225\234\272\377\234\243\302\377\221\230\265\377" \
+  "\233\242\301\377\205\234\243\302\377\1=>A\377\204\354\354\341\377\2\353" \
+  "\353\340\377\332\332\320\377\224\354\354\341\377\1""89<\377\206\234\243" \
+  "\302\377\2\221\230\265\377CDE\377\233\354\354\341\377\2\332\332\320\377" \
+  "\353\353\340\377\215\354\354\341\377\2\342\342\330\377\344\344\331\377" \
+  "\203\354\354\341\377\2\341\341\327\377\343\343\331\377\243\354\354\341" \
+  "\377\2GGI\377\232\241\300\377\203\234\243\302\377\2\221\230\265\377\233" \
+  "\242\301\377\214\234\243\302\377\3z\200\230\377qro\377\345\345\332\377" \
+  "\233\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \
+  "\377\2\332\332\320\377\77AE\377\205\234\243\302\377\2TWh\377sy\217\377" \
+  "\203\234\243\302\377\5\225\233\271\377\227\236\274\377\234\243\302\377" \
+  "\223\232\267\377\231\240\276\377\204\234\243\302\377\2\226\235\273\377" \
+  "LLM\377\204\354\354\341\377\2\345\345\332\377\337\337\325\377\224\354" \
+  "\354\341\377\2RSS\377\215\223\257\377\205\234\243\302\377\3\226\235\273" \
+  "\3779;@\377\347\347\334\377\232\354\354\341\377\2\337\337\325\377\345" \
+  "\345\332\377\215\354\354\341\377\2\345\345\332\377\341\341\327\377\203" \
+  "\354\354\341\377\2\346\346\333\377\337\337\324\377\243\354\354\341\377" \
+  "\1CEG\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377\3" \
+  "pu\213\377\202\203}\377\350\350\335\377\233\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\233\354\354\341\377\2\335\335\322\377ABE\377" \
+  "\205\234\243\302\377\2FIW\377\202\210\243\377\203\234\243\302\377\5\223" \
+  "\232\267\377\231\240\276\377\234\243\302\377\225\233\271\377\227\236" \
+  "\274\377\204\234\243\302\377\2}\203\233\377wwu\377\204\354\354\341\377" \
+  "\202\342\342\330\377\224\354\354\341\377\2\215\215\210\377jo\204\377" \
+  "\205\234\243\302\377\3\226\235\273\377TXe\377\265\265\254\377\232\354" \
+  "\354\341\377\202\342\342\330\377\215\354\354\341\377\2\350\350\335\377" \
+  "\337\337\324\377\203\354\354\341\377\2\352\352\337\377\334\334\322\377" \
+  "\243\354\354\341\377\1BCG\377\204\234\243\302\377\1\220\227\264\377\215" \
+  "\234\243\302\377\3fk\177\377\223\223\213\377\353\353\340\377\233\354" \
+  "\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2" \
+  "\337\337\325\377CDF\377\205\234\243\302\377\2""9<G\377\222\231\266\377" \
+  "\203\234\243\302\377\5\221\230\265\377\233\242\301\377\234\243\302\377" \
+  "\227\235\273\377\225\234\272\377\204\234\243\302\377\2pu\213\377\217" \
+  "\220\212\377\204\354\354\341\377\2\337\337\325\377\345\345\332\377\224" \
+  "\354\354\341\377\2\302\302\271\377QT_\377\205\234\243\302\377\3\226\235" \
+  "\273\377di}\377\224\224\216\377\232\354\354\341\377\2\345\345\332\377" \
+  "\337\337\325\377\215\354\354\341\377\2\353\353\340\377\334\334\322\377" \
+  "\203\354\354\341\377\2\353\353\340\377\332\332\320\377\243\354\354\341" \
+  "\377\1ABF\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377" \
+  "\2_cs\377\241\241\231\377\234\354\354\341\377\2\335\335\322\377\350\350" \
+  "\335\377\233\354\354\341\377\3\342\342\330\377EFG\377\233\242\301\377" \
+  "\204\234\243\302\377\1""02<\377\204\234\243\302\377\1\220\227\264\377" \
+  "\202\234\243\302\377\2\231\240\276\377\224\232\270\377\204\234\243\302" \
+  "\377\2ej}\377\241\241\232\377\204\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\224\354\354\341\377\2\331\331\317\377FHP\377\205\234\243" \
+  "\302\377\3\226\235\273\377ty\220\377{{x\377\232\354\354\341\377\2\350" \
+  "\350\335\377\335\335\322\377\216\354\354\341\377\1\333\333\321\377\204" \
+  "\354\354\341\377\1\331\331\317\377\243\354\354\341\377\1\77AF\377\204" \
+  "\234\243\302\377\1\220\227\264\377\215\234\243\302\377\2WZg\377\260\260" \
+  "\250\377\234\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354" \
+  "\354\341\377\3\345\345\332\377RSS\377\221\230\265\377\204\234\243\302" \
+  "\377\1""02<\377\204\234\243\302\377\1\220\227\264\377\202\234\243\302" \
+  "\377\2\233\242\301\377\222\230\265\377\204\234\243\302\377\2X\\m\377" \
+  "\261\261\251\377\204\354\354\341\377\2\332\332\320\377\353\353\340\377" \
+  "\224\354\354\341\377\2\352\352\337\377=\77D\377\205\234\243\302\377\3" \
+  "\226\235\273\377\203\211\243\377ccc\377\232\354\354\341\377\2\353\353" \
+  "\340\377\332\332\320\377\216\354\354\341\377\1\333\333\321\377\204\354" \
+  "\354\341\377\1\331\331\317\377\231\354\354\341\377\1\352\352\337\377" \
+  "\210\351\351\336\377\2\350\350\335\377>\77E\377\203\232\241\277\377\2" \
+  "\230\237\275\377\220\226\263\377\215\232\241\277\377\2NPY\377\275\275" \
+  "\263\377\234\351\351\336\377\2\332\332\320\377\345\345\332\377\233\351" \
+  "\351\336\377\3\345\345\332\377_`_\377\204\212\245\377\204\232\241\277" \
+  "\377\1/1;\377\204\232\241\277\377\1\217\225\261\377\203\232\241\277\377" \
+  "\1\217\225\261\377\204\232\241\277\377\2KN[\377\277\277\266\377\204\351" \
+  "\351\336\377\1\326\326\314\377\226\351\351\336\377\1>@D\377\205\232\241" \
+  "\277\377\3\224\233\270\377\217\225\261\377KLM\377\233\351\351\336\377" \
+  "\1\326\326\314\377\216\351\351\336\377\1\330\330\316\377\204\351\351" \
+  "\336\377\1\326\326\314\377\213\351\351\336\377\1\352\352\337\377\215" \
+  "\354\354\341\377\1\342\342\330\377\210\334\334\322\377\2\330\330\316" \
+  "\377<>D\377\203\221\230\265\377\2\217\226\262\377\210\217\252\377\215" \
+  "\221\230\265\377\2FGP\377\271\271\260\377\234\334\334\322\377\2\316\316" \
+  "\304\377\330\330\316\377\233\334\334\322\377\3\331\331\317\377ab`\377" \
+  "y~\227\377\204\221\230\265\377\1-/8\377\204\221\230\265\377\1\206\215" \
+  "\250\377\203\221\230\265\377\1\206\215\250\377\204\221\230\265\377\2" \
+  "@CO\377\274\274\264\377\204\334\334\322\377\1\312\312\301\377\226\334" \
+  "\334\322\377\1<=A\377\205\221\230\265\377\3\213\222\256\377\211\220\253" \
+  "\377DEF\377\233\334\334\322\377\1\312\312\301\377\216\334\334\322\377" \
+  "\1\314\314\303\377\204\334\334\322\377\1\312\312\301\377\213\334\334" \
+  "\322\377\1\341\341\327\377\227\354\354\341\377\1\77@E\377\204\234\243" \
+  "\302\377\1\221\230\265\377\215\234\243\302\377\2SVa\377\270\270\260\377" \
+  "\234\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \
+  "\377\3\346\346\333\377YZZ\377\214\223\256\377\204\234\243\302\377\1/" \
+  "1;\377\204\234\243\302\377\1\220\227\264\377\203\234\243\302\377\1\220" \
+  "\227\264\377\204\234\243\302\377\2QTc\377\272\272\262\377\204\354\354" \
+  "\341\377\1\331\331\317\377\226\354\354\341\377\1=>C\377\205\234\243\302" \
+  "\377\3\226\235\273\377\212\220\253\377YZZ\377\233\354\354\341\377\1\331" \
+  "\331\317\377\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377" \
+  "\1\331\331\317\377\243\354\354\341\377\1@AF\377\204\234\243\302\377\1" \
+  "\220\227\264\377\215\234\243\302\377\2[_m\377\251\251\241\377\234\354" \
+  "\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\3" \
+  "\343\343\331\377JKL\377\227\236\274\377\204\234\243\302\377\1/1:\377" \
+  "\204\234\243\302\377\1\220\227\264\377\202\234\243\302\377\2\232\241" \
+  "\277\377\222\231\266\377\204\234\243\302\377\2]at\377\251\251\241\377" \
+  "\204\354\354\341\377\2\333\333\321\377\352\352\337\377\224\354\354\341" \
+  "\377\2\347\347\334\377=\77E\377\205\234\243\302\377\3\226\235\273\377" \
+  "~\204\235\377mnl\377\232\354\354\341\377\2\352\352\337\377\333\333\321" \
+  "\377\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377\1\331" \
+  "\331\317\377\243\354\354\341\377\1ACF\377\204\234\243\302\377\1\220\227" \
+  "\264\377\215\234\243\302\377\2cgy\377\231\231\222\377\234\354\354\341" \
+  "\377\2\335\335\322\377\350\350\335\377\233\354\354\341\377\2\340\340" \
+  "\326\377CCE\377\205\234\243\302\377\2""69C\377\224\232\270\377\203\234" \
+  "\243\302\377\1\220\227\264\377\202\234\243\302\377\2\230\237\275\377" \
+  "\224\233\270\377\204\234\243\302\377\2im\202\377\227\227\220\377\204" \
+  "\354\354\341\377\2\336\336\323\377\347\347\334\377\224\354\354\341\377" \
+  "\2\327\327\315\377FHP\377\205\234\243\302\377\3\226\235\273\377rx\217" \
+  "\377\201\202~\377\232\354\354\341\377\2\347\347\334\377\336\336\323\377" \
+  "\216\354\354\341\377\1\333\333\321\377\204\354\354\341\377\1\331\331" \
+  "\317\377\243\354\354\341\377\1BCF\377\204\234\243\302\377\1\220\227\264" \
+  "\377\215\234\243\302\377\3kp\205\377\212\212\204\377\352\352\337\377" \
+  "\233\354\354\341\377\2\335\335\322\377\350\350\335\377\233\354\354\341" \
+  "\377\2\336\336\323\377BCE\377\205\234\243\302\377\2ADR\377\205\213\246" \
+  "\377\203\234\243\302\377\3\222\231\266\377\232\241\277\377\234\243\302" \
+  "\377\202\226\235\273\377\204\234\243\302\377\2sx\217\377\203\203\177" \
+  "\377\204\354\354\341\377\2\340\340\326\377\344\344\331\377\224\354\354" \
+  "\341\377\2\254\254\244\377[_o\377\205\234\243\302\377\3\226\235\273\377" \
+  "ej}\377\231\231\222\377\232\354\354\341\377\2\344\344\331\377\340\340" \
+  "\326\377\215\354\354\341\377\2\351\351\336\377\336\336\323\377\203\354" \
+  "\354\341\377\2\352\352\337\377\333\333\321\377\243\354\354\341\377\1" \
+  "CDF\377\204\234\243\302\377\1\220\227\264\377\215\234\243\302\377\3v" \
+  "{\222\377zzw\377\346\346\333\377\233\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\233\354\354\341\377\2\333\333\321\377@BE\377\205\234" \
+  "\243\302\377\2NRa\377w}\224\377\203\234\243\302\377\5\224\233\270\377" \
+  "\230\237\275\377\234\243\302\377\224\233\270\377\230\237\275\377\204" \
+  "\234\243\302\377\2\204\212\245\377ghg\377\204\354\354\341\377\2\343\343" \
+  "\331\377\341\341\327\377\224\354\354\341\377\2ssq\377z\200\230\377\205" \
+  "\234\243\302\377\3\226\235\273\377KNW\377\312\312\301\377\232\354\354" \
+  "\341\377\2\341\341\327\377\343\343\331\377\215\354\354\341\377\2\346" \
+  "\346\333\377\340\340\326\377\203\354\354\341\377\2\350\350\335\377\335" \
+  "\335\322\377\243\354\354\341\377\2TUU\377\222\230\265\377\203\234\243" \
+  "\302\377\2\222\231\266\377\232\241\277\377\214\234\243\302\377\3\200" \
+  "\206\237\377jjh\377\341\341\327\377\233\354\354\341\377\2\335\335\322" \
+  "\377\350\350\335\377\233\354\354\341\377\2\330\330\316\377\77AE\377\205" \
+  "\234\243\302\377\2\\`r\377hm\201\377\203\234\243\302\377\202\226\235" \
+  "\273\377\3\234\243\302\377\222\231\266\377\232\241\277\377\204\234\243" \
+  "\302\377\2\232\241\300\377CDE\377\204\354\354\341\377\2\350\350\335\377" \
+  "\335\335\322\377\224\354\354\341\377\2BCD\377\230\237\275\377\205\234" \
+  "\243\302\377\2\226\235\273\3779:>\377\233\354\354\341\377\2\335\335\322" \
+  "\377\350\350\335\377\215\354\354\341\377\202\343\343\331\377\203\354" \
+  "\354\341\377\2\344\344\331\377\340\340\326\377\243\354\354\341\377\2" \
+  "{|x\377z\177\230\377\203\234\243\302\377\2\224\233\270\377\230\237\275" \
+  "\377\214\234\243\302\377\3\212\221\254\377[\\[\377\332\332\320\377\233" \
+  "\354\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377" \
+  "\3\352\352\337\377\333\333\321\377>@E\377\205\234\243\302\377\2jn\204" \
+  "\377Y]o\377\203\234\243\302\377\4\230\237\275\377\224\233\270\377\234" \
+  "\243\302\377\220\227\264\377\206\234\243\302\377\1;=A\377\205\354\354" \
+  "\341\377\1\331\331\317\377\224\354\354\341\377\1""89=\377\206\234\243" \
+  "\302\377\2\215\224\260\377JKK\377\233\354\354\341\377\1\331\331\317\377" \
+  "\216\354\354\341\377\2\340\340\326\377\346\346\333\377\203\354\354\341" \
+  "\377\2\337\337\325\377\345\345\332\377\243\354\354\341\377\2\244\244" \
+  "\235\377dh{\377\203\234\243\302\377\202\226\235\273\377\214\234\243\302" \
+  "\377\4\225\233\271\377KLL\377\331\331\317\377\353\353\340\377\232\354" \
+  "\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377\3" \
+  "\340\340\326\377\327\327\315\377FHO\377\205\234\243\302\377\2\205\213" \
+  "\246\377DGU\377\203\234\243\302\377\4\232\241\277\377\222\231\266\377" \
+  "\234\243\302\377\220\227\264\377\206\234\243\302\377\2IKT\377\323\323" \
+  "\311\377\204\354\354\341\377\2\336\336\323\377\347\347\334\377\222\354" \
+  "\354\341\377\2\312\312\301\377KMW\377\206\234\243\302\377\2jn\203\377" \
+  "\205\206\200\377\232\354\354\341\377\2\347\347\334\377\336\336\323\377" \
+  "\216\354\354\341\377\2\336\336\323\377\351\351\336\377\203\354\354\341" \
+  "\377\2\333\333\321\377\352\352\337\377\243\354\354\341\377\2\310\310" \
+  "\277\377QS^\377\203\234\243\302\377\2\230\237\276\377\223\232\267\377" \
+  "\215\234\243\302\377\3<=\77\377\340\340\326\377\344\344\331\377\232\354" \
+  "\354\341\377\2\335\335\322\377\350\350\335\377\232\354\354\341\377\3" \
+  "\331\331\317\377\302\302\271\377UXd\377\206\234\243\302\377\1/1;\377" \
+  "\204\234\243\302\377\3\220\227\264\377\234\243\302\377\220\226\263\377" \
+  "\206\234\243\302\377\2aex\377\244\244\234\377\204\354\354\341\377\2\346" \
+  "\346\333\377\337\337\324\377\222\354\354\341\377\2\223\224\215\377fk" \
+  "\177\377\206\234\243\302\377\2=\77E\377\320\320\306\377\232\354\354\341" \
+  "\377\2\337\337\324\377\346\346\333\377\216\354\354\341\377\1\333\333" \
+  "\321\377\204\354\354\341\377\1\331\331\317\377\244\354\354\341\377\2" \
+  "\350\350\335\377<=B\377\204\234\243\302\377\1\220\226\263\377\215\234" \
+  "\243\302\377\3:<A\377\345\345\332\377\334\334\322\377\232\354\354\341" \
+  "\377\2\335\335\322\377\350\350\335\377\231\354\354\341\377\4\353\353" \
+  "\340\377\331\331\317\377\216\216\211\377ot\212\377\206\234\243\302\377" \
+  "\2""69D\377\224\233\270\377\203\234\243\302\377\3\220\227\264\377\227" \
+  "\236\275\377\223\232\267\377\206\234\243\302\377\2\210\216\251\377\\" \
+  "]\\\377\205\354\354\341\377\1\331\331\317\377\222\354\354\341\377\2E" \
+  "FG\377\224\232\270\377\205\234\243\302\377\3\211\217\252\377RRR\377\342" \
+  "\342\330\377\232\354\354\341\377\1\331\331\317\377\216\354\354\341\377" \
+  "\2\353\353\340\377\333\333\321\377\204\354\354\341\377\1\331\331\317" \
+  "\377\245\354\354\341\377\2JKK\377\223\232\267\377\203\234\243\302\377" \
+  "\2\222\230\265\377\232\241\277\377\214\234\243\302\377\3SUa\377\276\276" \
+  "\265\377\331\331\317\377\232\354\354\341\377\2\335\335\322\377\350\350" \
+  "\335\377\231\354\354\341\377\4\342\342\330\377\340\340\326\377VWW\377" \
+  "\220\226\263\377\206\234\243\302\377\2Z^p\377kp\207\377\203\234\243\302" \
+  "\377\3\225\234\272\377\215\224\260\377\231\240\276\377\207\234\243\302" \
+  "\377\1;<@\377\205\354\354\341\377\2\334\334\322\377\350\350\335\377\220" \
+  "\354\354\341\377\2\321\321\307\377FHP\377\206\234\243\302\377\3MPZ\377" \
+  "\272\272\261\377\342\342\330\377\231\354\354\341\377\2\350\350\335\377" \
+  "\334\334\322\377\216\354\354\341\377\2\344\344\331\377\342\342\330\377" \
+  "\203\354\354\341\377\2\345\345\332\377\337\337\324\377\245\354\354\341" \
+  "\377\2\225\225\220\377im\201\377\203\234\243\302\377\2\227\236\274\377" \
+  "\224\233\270\377\214\234\243\302\377\4ns\211\377\211\211\204\377\342" \
+  "\342\330\377\340\340\326\377\231\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\231\354\354\341\377\3\330\330\316\377\353\353\340\377\77" \
+  "@C\377\207\234\243\302\377\2\204\212\245\377CFS\377\203\234\243\302\377" \
+  "\2\232\241\300\377\206\214\247\377\210\234\243\302\377\2SWd\377\277\277" \
+  "\266\377\204\354\354\341\377\2\350\350\335\377\333\333\321\377\220\354" \
+  "\354\341\377\2opn\377{\201\231\377\205\234\243\302\377\4\222\231\266" \
+  "\377ABC\377\343\343\331\377\342\342\330\377\231\354\354\341\377\2\333" \
+  "\333\321\377\347\347\334\377\216\354\354\341\377\2\334\334\322\377\352" \
+  "\352\337\377\203\354\354\341\377\2\335\335\322\377\350\350\335\377\245" \
+  "\354\354\341\377\2\335\335\322\377CDK\377\204\234\243\302\377\1\220\226" \
+  "\263\377\214\234\243\302\377\5\217\226\262\377RSS\377\354\354\341\377" \
+  "\330\330\316\377\353\353\340\377\230\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\230\354\354\341\377\4\341\341\327\377\340\340\326\377" \
+  "\342\342\330\377ACI\377\210\234\243\302\377\1.09\377\203\234\243\302" \
+  "\377\2\232\241\277\377\207\216\251\377\210\234\243\302\377\2\200\206" \
+  "\237\377oom\377\205\354\354\341\377\2\334\334\322\377\347\347\334\377" \
+  "\216\354\354\341\377\2\337\337\325\3778:>\377\206\234\243\302\377\4E" \
+  "GP\377\273\273\262\377\343\343\331\377\342\342\330\377\230\354\354\341" \
+  "\377\2\347\347\334\377\333\333\321\377\217\354\354\341\377\1\333\333" \
+  "\321\377\204\354\354\341\377\1\330\330\316\377\247\354\354\341\377\2" \
+  "CDF\377\231\240\276\377\203\234\243\302\377\2\220\227\264\377\233\242" \
+  "\301\377\214\234\243\302\377\4<=@\377\354\354\341\377\344\344\331\377" \
+  "\337\337\324\377\230\354\354\341\377\2\335\335\322\377\350\350\335\377" \
+  "\227\354\354\341\377\5\353\353\340\377\327\327\315\377\354\354\341\377" \
+  "\264\264\254\377[_m\377\210\234\243\302\377\2""7:D\377\220\226\263\377" \
+  "\202\234\243\302\377\3\224\232\270\377\220\227\264\377\230\237\275\377" \
+  "\210\234\243\302\377\2""89<\377\353\353\340\377\204\354\354\341\377\2" \
+  "\351\351\336\377\332\332\320\377\216\354\354\341\377\2fge\377w|\224\377" \
+  "\205\234\243\302\377\5sx\215\377iig\377\354\354\341\377\343\343\331\377" \
+  "\342\342\330\377\230\354\354\341\377\2\331\331\317\377\351\351\336\377" \
+  "\216\354\354\341\377\2\346\346\333\377\340\340\326\377\203\354\354\341" \
+  "\377\2\347\347\334\377\335\335\322\377\247\354\354\341\377\2\204\204" \
+  "\177\377sx\217\377\203\234\243\302\377\2\225\234\272\377\226\235\273" \
+  "\377\214\234\243\302\377\5@BI\377\337\337\325\377\354\354\341\377\331" \
+  "\331\317\377\352\352\337\377\227\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\227\354\354\341\377\5\337\337\324\377\343\343\331\377\354" \
+  "\354\341\377}}y\377w}\225\377\210\234\243\302\377\2]at\377gl\200\377" \
+  "\202\234\243\302\377\3\220\226\263\377\232\241\277\377\222\230\265\377" \
+  "\210\234\243\302\377\2Z^l\377\245\245\236\377\205\354\354\341\377\2\336" \
+  "\336\323\377\345\345\332\377\214\354\354\341\377\2\311\311\300\377BD" \
+  "L\377\205\234\243\302\377\6\224\232\270\37778;\377\345\345\332\377\354" \
+  "\354\341\377\343\343\331\377\342\342\330\377\227\354\354\341\377\2\345" \
+  "\345\332\377\335\335\322\377\217\354\354\341\377\2\336\336\323\377\351" \
+  "\351\336\377\203\354\354\341\377\2\337\337\324\377\345\345\332\377\247" \
+  "\354\354\341\377\2\321\321\307\377KMV\377\203\234\243\302\377\2\233\242" \
+  "\301\377\220\227\264\377\214\234\243\302\377\5\\`p\377\256\256\246\377" \
+  "\354\354\341\377\347\347\334\377\334\334\322\377\227\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\226\354\354\341\377\2\352\352\337" \
+  "\377\330\330\316\377\202\354\354\341\377\2JKK\377\225\234\272\377\210" \
+  "\234\243\302\377\7\211\217\252\377<\77K\377\234\243\302\377\232\241\300" \
+  "\377\221\230\265\377\234\243\302\377\220\226\263\377\210\234\243\302" \
+  "\377\2\222\231\266\377ABC\377\205\354\354\341\377\2\353\353\340\377\330" \
+  "\330\316\377\214\354\354\341\377\2EFG\377\212\221\254\377\204\234\243" \
+  "\302\377\3\230\237\276\377<=D\377\270\270\257\377\202\354\354\341\377" \
+  "\2\343\343\331\377\342\342\330\377\227\354\354\341\377\2\330\330\316" \
+  "\377\352\352\337\377\217\354\354\341\377\1\332\332\320\377\204\354\354" \
+  "\341\377\1\330\330\316\377\251\354\354\341\377\1\77AC\377\204\234\243" \
+  "\302\377\2\220\227\264\377\233\242\301\377\213\234\243\302\377\2|\201" \
+  "\232\377nol\377\202\354\354\341\377\2\337\337\324\377\341\341\327\377" \
+  "\226\354\354\341\377\2\335\335\322\377\350\350\335\377\225\354\354\341" \
+  "\377\6\353\353\340\377\330\330\316\377\350\350\335\377\354\354\341\377" \
+  "\352\352\337\3779:>\377\212\234\243\302\377\7""14=\377\221\230\264\377" \
+  "\225\233\271\377\227\235\273\377\234\243\302\377\223\232\267\377\230" \
+  "\237\276\377\210\234\243\302\377\2JLV\377\305\305\273\377\205\354\354" \
+  "\341\377\2\344\344\331\377\334\334\322\377\212\354\354\341\377\2rrp\377" \
+  "ej{\377\204\234\243\302\377\3\231\240\276\377>\77G\377\246\246\237\377" \
+  "\203\354\354\341\377\2\343\343\331\377\342\342\330\377\226\354\354\341" \
+  "\377\2\334\334\322\377\344\344\331\377\217\354\354\341\377\2\347\347" \
+  "\334\377\337\337\324\377\203\354\354\341\377\2\351\351\336\377\333\333" \
+  "\321\377\251\354\354\341\377\2ssq\377~\204\235\377\203\234\243\302\377" \
+  "\2\227\236\274\377\224\232\270\377\214\234\243\302\377\1""78;\377\203" \
+  "\354\354\341\377\2\332\332\320\377\345\345\332\377\225\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\225\354\354\341\377\2\333\333\321" \
+  "\377\344\344\331\377\202\354\354\341\377\2\254\254\244\377Y\\k\377\212" \
+  "\234\243\302\377\3mr\207\377QUe\377\217\226\262\377\202\234\243\302\377" \
+  "\2\232\241\300\377\220\227\264\377\210\234\243\302\377\2\205\213\246" \
+  "\377YZY\377\206\354\354\341\377\2\337\337\325\377\340\340\326\377\210" \
+  "\354\354\341\377\2\223\224\216\377QT`\377\204\234\243\302\377\3\232\241" \
+  "\277\377ACJ\377\243\244\235\377\204\354\354\341\377\2\343\343\331\377" \
+  "\342\342\330\377\225\354\354\341\377\2\340\340\326\377\337\337\325\377" \
+  "\220\354\354\341\377\2\333\333\321\377\352\352\337\377\203\354\354\341" \
+  "\377\2\340\340\326\377\343\343\331\377\251\354\354\341\377\2\305\305" \
+  "\273\377LNX\377\204\234\243\302\377\2\220\227\264\377\232\241\300\377" \
+  "\213\234\243\302\377\2TWd\377\265\265\255\377\202\354\354\341\377\3\353" \
+  "\353\340\377\330\330\316\377\351\351\336\377\224\354\354\341\377\2\335" \
+  "\335\322\377\350\350\335\377\224\354\354\341\377\2\337\337\325\377\340" \
+  "\340\326\377\203\354\354\341\377\2QQR\377\215\223\257\377\212\234\243" \
+  "\302\377\3\232\241\300\377&(1\377\225\233\271\377\203\234\243\302\377" \
+  "\2\223\232\267\377\230\237\275\377\210\234\243\302\377\2@BJ\377\312\312" \
+  "\301\377\206\354\354\341\377\2\333\333\321\377\345\345\332\377\206\354" \
+  "\354\341\377\3\260\260\250\377@BI\377\233\242\301\377\203\234\243\302" \
+  "\377\3\204\212\245\3779:\77\377\243\243\235\377\205\354\354\341\377\2" \
+  "\343\343\331\377\342\342\330\377\224\354\354\341\377\2\345\345\332\377" \
+  "\333\333\321\377\220\354\354\341\377\2\346\346\333\377\337\337\324\377" \
+  "\204\354\354\341\377\2\330\330\316\377\353\353\340\377\252\354\354\341" \
+  "\377\2KLL\377\211\217\253\377\203\234\243\302\377\2\231\240\276\377\222" \
+  "\230\265\377\213\234\243\302\377\2\211\217\252\377XXX\377\203\354\354" \
+  "\341\377\3\351\351\336\377\327\327\315\377\353\353\340\377\223\354\354" \
+  "\341\377\2\335\335\322\377\350\350\335\377\223\354\354\341\377\2\344" \
+  "\344\331\377\334\334\322\377\203\354\354\341\377\2\340\340\326\377=>" \
+  "D\377\213\234\243\302\377\3\233\242\301\377ORc\377gk\200\377\203\234" \
+  "\243\302\377\2\233\242\301\377\220\226\263\377\210\234\243\302\377\2" \
+  "\211\217\253\377GHI\377\206\354\354\341\377\3\353\353\340\377\330\330" \
+  "\316\377\350\350\335\377\204\354\354\341\377\3\225\225\220\377<=C\377" \
+  "\227\235\273\377\202\234\243\302\377\4\232\241\277\377X[i\377LLM\377" \
+  "\326\326\314\377\206\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\223\354\354\341\377\3\350\350\335\377\330\330\316\377\353\353\340\377" \
+  "\220\354\354\341\377\2\332\332\320\377\353\353\340\377\203\354\354\341" \
+  "\377\2\344\344\331\377\337\337\324\377\253\354\354\341\377\2\310\310" \
+  "\277\377BEM\377\204\234\243\302\377\2\221\230\265\377\231\240\276\377" \
+  "\213\234\243\302\377\2;<A\377\345\345\332\377\203\354\354\341\377\3\346" \
+  "\346\333\377\330\330\316\377\351\351\336\377\222\354\354\341\377\2\335" \
+  "\335\322\377\350\350\335\377\222\354\354\341\377\3\342\342\330\377\332" \
+  "\332\320\377\353\353\340\377\203\354\354\341\377\2\221\221\214\377hl" \
+  "\200\377\213\234\243\302\377\3\222\231\266\377\220\226\263\377,.7\377" \
+  "\204\234\243\302\377\2\224\233\270\377\227\235\273\377\210\234\243\302" \
+  "\377\2RUa\377\252\252\243\377\206\354\354\341\377\15\351\351\336\377" \
+  "\330\330\316\377\346\346\333\377\354\354\341\377\346\346\333\377^_]\377" \
+  "SVc\377\233\242\301\377\234\243\302\377\211\217\252\377WZh\37778;\377" \
+  "\233\233\225\377\210\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\222\354\354\341\377\3\346\346\333\377\330\330\316\377\351\351\336\377" \
+  "\220\354\354\341\377\2\344\344\331\377\340\340\326\377\204\354\354\341" \
+  "\377\2\330\330\316\377\353\353\340\377\254\354\354\341\377\2[[[\377\177" \
+  "\205\237\377\203\234\243\302\377\2\232\241\277\377\220\227\264\377\213" \
+  "\234\243\302\377\2chy\377\234\234\225\377\204\354\354\341\377\3\350\350" \
+  "\335\377\330\330\316\377\346\346\333\377\221\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\221\354\354\341\377\2\336\336\323\377\335\335" \
+  "\322\377\205\354\354\341\377\2BCE\377\227\235\273\377\212\234\243\302" \
+  "\377\5\232\241\277\377\220\227\264\377\234\243\302\377CFU\377x~\226\377" \
+  "\204\234\243\302\377\1\220\226\263\377\210\234\243\302\377\3\225\234" \
+  "\272\37778:\377\350\350\335\377\206\354\354\341\377\12\353\353\340\377" \
+  "\331\331\317\377\313\313\302\377--.\377;>I\377\\`p\377QS_\377;<A\377" \
+  "[\\[\377\265\265\255\377\212\354\354\341\377\2\343\343\331\377\342\342" \
+  "\330\377\221\354\354\341\377\3\342\342\330\377\331\331\317\377\353\353" \
+  "\340\377\221\354\354\341\377\1\332\332\320\377\204\354\354\341\377\2" \
+  "\341\341\327\377\340\340\326\377\255\354\354\341\377\2\325\325\313\377" \
+  ";=B\377\204\234\243\302\377\2\222\231\266\377\230\237\275\377\212\234" \
+  "\243\302\377\2\224\233\270\377GHI\377\205\354\354\341\377\3\353\353\340" \
+  "\377\331\331\317\377\342\342\330\377\220\354\354\341\377\2\335\335\322" \
+  "\377\350\350\335\377\217\354\354\341\377\3\353\353\340\377\332\332\320" \
+  "\377\342\342\330\377\205\354\354\341\377\2\322\322\310\377GIQ\377\213" \
+  "\234\243\302\377\6\222\230\265\377\231\240\276\377\234\243\302\377\211" \
+  "\217\252\37768C\377\233\242\301\377\203\234\243\302\377\2\226\235\273" \
+  "\377\225\233\271\377\210\234\243\302\377\2jn\201\377vwt\377\210\354\354" \
+  "\341\377\6\303\303\272\377}}y\377\235\235\226\377\261\261\251\377\306" \
+  "\306\274\377\350\350\335\377\214\354\354\341\377\2\343\343\331\377\342" \
+  "\342\330\377\220\354\354\341\377\2\336\336\323\377\335\335\322\377\222" \
+  "\354\354\341\377\2\341\341\327\377\343\343\331\377\203\354\354\341\377" \
+  "\2\353\353\340\377\327\327\315\377\257\354\354\341\377\2mmk\377ty\220" \
+  "\377\203\234\243\302\377\2\233\242\301\377\220\226\263\377\213\234\243" \
+  "\302\377\2DFM\377\327\327\315\377\206\354\354\341\377\202\335\335\322" \
+  "\377\1\352\352\337\377\216\354\354\341\377\2\335\335\322\377\350\350" \
+  "\335\377\216\354\354\341\377\3\346\346\333\377\330\330\316\377\346\346" \
+  "\333\377\206\354\354\341\377\2vvs\377x}\225\377\212\234\243\302\377\2" \
+  "\231\240\276\377\222\230\265\377\203\234\243\302\377\2""46@\377\205\213" \
+  "\246\377\204\234\243\302\377\2\220\226\263\377\233\242\301\377\210\234" \
+  "\243\302\377\2BDM\377\270\270\257\377\210\354\354\341\377\3\341\341\327" \
+  "\377\331\331\317\377\350\350\335\377\216\354\354\341\377\2\343\343\331" \
+  "\377\342\342\330\377\216\354\354\341\377\3\351\351\336\377\331\331\317" \
+  "\377\341\341\327\377\222\354\354\341\377\2\353\353\340\377\332\332\320" \
+  "\377\204\354\354\341\377\2\337\337\325\377\342\342\330\377\257\354\354" \
+  "\341\377\3\337\337\325\37778<\377\233\242\301\377\203\234\243\302\377" \
+  "\2\225\233\271\377\225\234\272\377\212\234\243\302\377\2{\201\231\377" \
+  "^^^\377\207\354\354\341\377\4\345\345\332\377\330\330\316\377\337\337" \
+  "\325\377\353\353\340\377\214\354\354\341\377\2\335\335\322\377\350\350" \
+  "\335\377\214\354\354\341\377\4\350\350\335\377\332\332\320\377\334\334" \
+  "\322\377\352\352\337\377\206\354\354\341\377\2\336\336\323\3779;\77\377" \
+  "\212\234\243\302\377\3\233\242\301\377\217\226\262\377\232\241\300\377" \
+  "\203\234\243\302\377\3fj\177\377/19\377\232\241\300\377\203\234\243\302" \
+  "\377\2\230\237\275\377\222\230\265\377\210\234\243\302\377\3\224\233" \
+  "\270\377569\377\337\337\324\377\210\354\354\341\377\4\350\350\335\377" \
+  "\332\332\320\377\335\335\322\377\352\352\337\377\214\354\354\341\377" \
+  "\2\343\343\331\377\342\342\330\377\214\354\354\341\377\4\352\352\337" \
+  "\377\335\335\322\377\332\332\320\377\350\350\335\377\223\354\354\341" \
+  "\377\2\335\335\322\377\346\346\333\377\203\354\354\341\377\2\352\352" \
+  "\337\377\330\330\316\377\261\354\354\341\377\2\201\202~\377jn\202\377" \
+  "\204\234\243\302\377\2\221\230\265\377\230\237\275\377\212\234\243\302" \
+  "\377\2ACJ\377\307\307\276\377\210\354\354\341\377\3\342\342\330\377\327" \
+  "\327\315\377\342\342\330\377\213\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\212\354\354\341\377\4\352\352\337\377\334\334\322\377\332" \
+  "\332\320\377\350\350\335\377\210\354\354\341\377\2eed\377z\177\230\377" \
+  "\212\234\243\302\377\2\221\230\265\377\230\237\275\377\204\234\243\302" \
+  "\377\3""9:@\377iig\377ei|\377\204\234\243\302\377\2\224\233\270\377\225" \
+  "\233\271\377\210\234\243\302\377\2|\201\232\377QQQ\377\212\354\354\341" \
+  "\377\4\345\345\332\377\330\330\316\377\337\337\324\377\353\353\340\377" \
+  "\212\354\354\341\377\2\343\343\331\377\342\342\330\377\212\354\354\341" \
+  "\377\4\353\353\340\377\337\337\324\377\330\330\316\377\345\345\332\377" \
+  "\224\354\354\341\377\2\341\341\327\377\340\340\326\377\204\354\354\341" \
+  "\377\2\335\335\322\377\345\345\332\377\261\354\354\341\377\3\347\347" \
+  "\334\377669\377\230\237\276\377\203\234\243\302\377\3\233\242\301\377" \
+  "\220\226\263\377\232\241\277\377\211\234\243\302\377\2\212\220\253\377" \
+  "FFG\377\211\354\354\341\377\5\353\353\340\377\337\337\325\377\330\330" \
+  "\316\377\337\337\324\377\347\347\334\377\210\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\207\354\354\341\377\5\353\353\340\377\343\343" \
+  "\331\377\333\333\321\377\331\331\317\377\346\346\333\377\211\354\354" \
+  "\341\377\2\314\314\303\377ACK\377\212\234\243\302\377\2\224\232\270\377" \
+  "\225\233\271\377\204\234\243\302\377\5pu\212\377uur\377\350\350\335\377" \
+  "568\377\216\225\261\377\204\234\243\302\377\2\222\230\265\377\227\236" \
+  "\274\377\210\234\243\302\377\2^bq\377zzw\377\213\354\354\341\377\4\343" \
+  "\343\331\377\330\330\316\377\335\335\322\377\345\345\332\377\210\354" \
+  "\354\341\377\2\343\343\331\377\342\342\330\377\210\354\354\341\377\4" \
+  "\345\345\332\377\335\335\322\377\330\330\316\377\343\343\331\377\225" \
+  "\354\354\341\377\2\345\345\332\377\335\335\322\377\204\354\354\341\377" \
+  "\2\351\351\336\377\331\331\317\377\263\354\354\341\377\2\251\251\241" \
+  "\377FHQ\377\204\234\243\302\377\3\232\241\300\377\217\226\262\377\233" \
+  "\242\301\377\211\234\243\302\377\2QT`\377\254\254\245\377\213\354\354" \
+  "\341\377\6\346\346\333\377\335\335\322\377\330\330\316\377\335\335\322" \
+  "\377\345\345\332\377\352\352\337\377\204\354\354\341\377\2\335\335\322" \
+  "\377\350\350\335\377\204\354\354\341\377\2\351\351\336\377\341\341\327" \
+  "\377\202\331\331\317\377\2\340\340\326\377\351\351\336\377\213\354\354" \
+  "\341\377\2LMM\377\211\217\252\377\211\234\243\302\377\2\227\235\273\377" \
+  "\222\230\265\377\204\234\243\302\377\7\213\221\255\37789;\377\343\343" \
+  "\331\377\354\354\341\377\274\274\264\377<>E\377\233\242\301\377\204\234" \
+  "\243\302\377\2\220\226\263\377\232\241\277\377\210\234\243\302\377\2" \
+  "OQ]\377\221\221\214\377\214\354\354\341\377\6\350\350\335\377\337\337" \
+  "\324\377\331\331\317\377\333\333\321\377\343\343\331\377\352\352\337" \
+  "\377\204\354\354\341\377\2\343\343\331\377\342\342\330\377\204\354\354" \
+  "\341\377\6\352\352\337\377\343\343\331\377\333\333\321\377\331\331\317" \
+  "\377\337\337\324\377\350\350\335\377\226\354\354\341\377\2\351\351\336" \
+  "\377\332\332\320\377\204\354\354\341\377\3\353\353\340\377\330\330\316" \
+  "\377\350\350\335\377\264\354\354\341\377\2}~z\377]`p\377\204\234\243" \
+  "\302\377\2\230\237\276\377\220\227\264\377\211\234\243\302\377\3\224" \
+  "\233\270\37789;\377\352\352\337\377\215\354\354\341\377\3\350\350\335" \
+  "\377\337\337\325\377\333\333\321\377\203\331\331\317\377\3\332\332\320" \
+  "\377\317\317\304\377\330\330\316\377\204\331\331\317\377\3\334\334\322" \
+  "\377\342\342\330\377\353\353\340\377\215\354\354\341\377\2\262\262\253" \
+  "\377NQ\\\377\211\234\243\302\377\2\231\240\276\377\220\226\263\377\204" \
+  "\234\243\302\377\3\226\235\273\37767;\377\317\317\305\377\203\354\354" \
+  "\341\377\2mnk\377fj}\377\204\234\243\302\377\3\232\241\300\377\217\226" \
+  "\262\377\233\242\301\377\210\234\243\302\377\2DFO\377\245\246\237\377" \
+  "\216\354\354\341\377\3\352\352\337\377\340\340\326\377\334\334\322\377" \
+  "\203\331\331\317\377\4\332\332\320\377\325\325\312\377\324\324\311\377" \
+  "\332\332\320\377\203\331\331\317\377\3\334\334\322\377\340\340\326\377" \
+  "\352\352\337\377\230\354\354\341\377\3\353\353\340\377\331\331\317\377" \
+  "\352\352\337\377\204\354\354\341\377\2\333\333\321\377\345\345\332\377" \
+  "\266\354\354\341\377\2TUT\377sy\216\377\204\234\243\302\377\2\226\235" \
+  "\273\377\223\232\267\377\211\234\243\302\377\2cgx\377\214\215\210\377" \
+  "\223\354\354\341\377\3\353\353\340\377\331\331\317\377\346\346\333\377" \
+  "\223\354\354\341\377\3\353\353\340\377:;=\377\223\232\267\377\210\234" \
+  "\243\302\377\3\232\241\300\377\217\226\262\377\232\241\300\377\204\234" \
+  "\243\302\377\2ACJ\377\262\262\253\377\204\354\354\341\377\3\347\347\334" \
+  "\377679\377\211\217\253\377\204\234\243\302\377\2\230\237\276\377\220" \
+  "\227\264\377\210\234\243\302\377\3\231\240\276\377<>D\377\264\264\255" \
+  "\377\224\354\354\341\377\2\340\340\326\377\337\337\325\377\237\354\354" \
+  "\341\377\2\333\333\321\377\347\347\334\377\204\354\354\341\377\2\337" \
+  "\337\325\377\340\340\326\377\267\354\354\341\377\3\345\345\332\377<<" \
+  "=\377\205\213\246\377\204\234\243\302\377\2\223\232\267\377\225\234\272" \
+  "\377\210\234\243\302\377\3\232\241\300\37778<\377\321\321\307\377\223" \
+  "\354\354\341\377\2\335\335\322\377\350\350\335\377\223\354\354\341\377" \
+  "\2\200\200|\377afw\377\210\234\243\302\377\3\233\242\301\377\220\226" \
+  "\263\377\231\240\276\377\204\234\243\302\377\2VYf\377\214\215\210\377" \
+  "\206\354\354\341\377\3\276\276\265\377>@H\377\226\235\273\377\204\234" \
+  "\243\302\377\2\227\235\273\377\222\231\266\377\210\234\243\302\377\3" \
+  "\226\235\273\377<>D\377\241\241\233\377\223\354\354\341\377\2\343\343" \
+  "\331\377\342\342\330\377\236\354\354\341\377\2\336\336\323\377\344\344" \
+  "\331\377\204\354\354\341\377\2\344\344\331\377\334\334\322\377\271\354" \
+  "\354\341\377\3\325\325\313\377458\377\222\231\266\377\204\234\243\302" \
+  "\377\2\222\231\266\377\223\232\267\377\210\234\243\302\377\3\212\220" \
+  "\253\3779:;\377\342\342\330\377\222\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\222\354\354\341\377\2\252\252\244\377DGP\377\210\234" \
+  "\243\302\377\3\232\241\277\377\217\226\262\377\230\237\275\377\204\234" \
+  "\243\302\377\2mr\206\377bca\377\210\354\354\341\377\3nol\377di|\377\230" \
+  "\237\276\377\204\234\243\302\377\3\225\234\272\377\221\230\265\377\233" \
+  "\242\301\377\207\234\243\302\377\3\232\241\277\377GIS\377\206\207\202" \
+  "\377\222\354\354\341\377\2\343\343\331\377\342\342\330\377\234\354\354" \
+  "\341\377\3\353\353\340\377\334\334\322\377\342\342\330\377\204\354\354" \
+  "\341\377\2\350\350\335\377\331\331\317\377\273\354\354\341\377\3\274" \
+  "\274\263\377:;B\377\232\241\300\377\204\234\243\302\377\3\225\234\272" \
+  "\377\220\227\264\377\233\242\301\377\207\234\243\302\377\3x~\225\377" \
+  "MMM\377\353\353\340\377\221\354\354\341\377\2\335\335\322\377\350\350" \
+  "\335\377\221\354\354\341\377\3\311\311\300\37779=\377\230\237\275\377" \
+  "\207\234\243\302\377\3\230\237\275\377\217\226\262\377\232\241\277\377" \
+  "\204\234\243\302\377\3\201\206\240\377EFF\377\351\351\336\377\210\354" \
+  "\354\341\377\4\347\347\334\377BCD\377sw\216\377\232\241\300\377\204\234" \
+  "\243\302\377\3\230\237\275\377\220\226\263\377\232\241\300\377\210\234" \
+  "\243\302\377\3VYg\377jjh\377\353\353\340\377\220\354\354\341\377\2\343" \
+  "\343\331\377\342\342\330\377\233\354\354\341\377\3\352\352\337\377\331" \
+  "\331\317\377\346\346\333\377\204\354\354\341\377\3\352\352\337\377\330" \
+  "\330\316\377\352\352\337\377\274\354\354\341\377\2\227\227\222\377LO" \
+  "Z\377\205\234\243\302\377\3\230\237\275\377\217\226\262\377\232\241\277" \
+  "\377\207\234\243\302\377\2cgx\377pqn\377\221\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\220\354\354\341\377\3\336\336\323\37778;\377" \
+  "\217\225\262\377\207\234\243\302\377\3\225\234\272\377\220\227\264\377" \
+  "\233\242\301\377\204\234\243\302\377\3\217\226\262\37778;\377\336\336" \
+  "\323\377\212\354\354\341\377\3\337\337\325\37789;\377{\201\232\377\205" \
+  "\234\243\302\377\3\232\241\277\377\217\226\262\377\230\237\276\377\210" \
+  "\234\243\302\377\3gl~\377@AB\377\321\321\307\377\217\354\354\341\377" \
+  "\2\343\343\331\377\342\342\330\377\232\354\354\341\377\3\347\347\334" \
+  "\377\331\331\317\377\351\351\336\377\205\354\354\341\377\2\331\331\317" \
+  "\377\347\347\334\377\276\354\354\341\377\3vvt\377QTa\377\233\242\301" \
+  "\377\204\234\243\302\377\3\232\241\277\377\217\226\262\377\230\237\275" \
+  "\377\207\234\243\302\377\2JLW\377\233\234\226\377\220\354\354\341\377" \
+  "\2\335\335\322\377\350\350\335\377\217\354\354\341\377\3\352\352\337" \
+  "\377FGG\377\177\205\237\377\207\234\243\302\377\202\223\232\267\377\205" \
+  "\234\243\302\377\3\212\221\254\37778<\377\310\310\277\377\214\354\354" \
+  "\341\377\4\327\327\315\377457\377\202\210\243\377\233\242\301\377\204" \
+  "\234\243\302\377\3\233\242\301\377\220\227\264\377\226\235\273\377\210" \
+  "\234\243\302\377\3\207\215\250\37778=\377\224\225\217\377\216\354\354" \
+  "\341\377\2\343\343\331\377\342\342\330\377\231\354\354\341\377\3\343" \
+  "\343\331\377\333\333\321\377\353\353\340\377\204\354\354\341\377\3\353" \
+  "\353\340\377\332\332\320\377\343\343\331\377\300\354\354\341\377\3\225" \
+  "\226\221\377\77AH\377\225\234\272\377\204\234\243\302\377\3\233\242\301" \
+  "\377\220\227\264\377\225\234\272\377\206\234\243\302\377\3\232\241\277" \
+  "\37789\77\377\267\267\256\377\217\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\216\354\354\341\377\3\353\353\340\377_`^\377mq\205\377\206" \
+  "\234\243\302\377\3\233\242\301\377\220\227\264\377\226\235\273\377\205" \
+  "\234\243\302\377\3{\200\230\377;<>\377\323\323\311\377\216\354\354\341" \
+  "\377\4\314\314\303\377126\377\201\206\240\377\231\240\276\377\205\234" \
+  "\243\302\377\202\223\232\267\377\210\234\243\302\377\4\232\241\300\377" \
+  "X\\j\377OPP\377\330\330\316\377\214\354\354\341\377\2\343\343\331\377" \
+  "\342\342\330\377\230\354\354\341\377\202\337\337\324\377\205\354\354" \
+  "\341\377\3\351\351\336\377\330\330\316\377\346\346\333\377\302\354\354" \
+  "\341\377\3\272\272\261\37779<\377\212\221\254\377\205\234\243\302\377" \
+  "\3\224\232\270\377\221\230\265\377\232\241\277\377\205\234\243\302\377" \
+  "\3\224\232\270\377;=D\377\217\217\212\377\216\354\354\341\377\2\335\335" \
+  "\322\377\350\350\335\377\215\354\354\341\377\3\337\337\324\377HII\377" \
+  "ei{\377\206\234\243\302\377\3\226\235\273\377\217\226\262\377\230\237" \
+  "\276\377\205\234\243\302\377\3gl~\377OOO\377\343\343\331\377\220\354" \
+  "\354\341\377\4\312\312\301\377347\377z\177\230\377\227\236\274\377\205" \
+  "\234\243\302\377\3\226\235\273\377\220\226\263\377\230\237\275\377\210" \
+  "\234\243\302\377\4\200\206\237\3779:@\377mnk\377\337\337\324\377\212" \
+  "\354\354\341\377\2\343\343\331\377\342\342\330\377\226\354\354\341\377" \
+  "\3\346\346\333\377\332\332\320\377\343\343\331\377\205\354\354\341\377" \
+  "\3\346\346\333\377\330\330\316\377\351\351\336\377\304\354\354\341\377" \
+  "\3\323\323\312\377<=\77\377{\200\230\377\205\234\243\302\377\4\232\241" \
+  "\277\377\221\230\265\377\222\231\266\377\232\241\300\377\204\234\243" \
+  "\302\377\4\233\242\301\377SWc\377__^\377\350\350\335\377\214\354\354" \
+  "\341\377\2\335\335\322\377\350\350\335\377\214\354\354\341\377\3\306" \
+  "\306\275\37777:\377}\203\233\377\205\234\243\302\377\3\230\237\275\377" \
+  "\220\226\263\377\225\233\271\377\205\234\243\302\377\4\233\242\301\377" \
+  "QS_\377qqo\377\353\353\340\377\222\354\354\341\377\4\327\327\315\377" \
+  "99;\377rx\217\377\225\233\271\377\205\234\243\302\377\4\233\242\301\377" \
+  "\223\232\267\377\220\227\264\377\231\240\276\377\210\234\243\302\377" \
+  "\4tz\220\37789>\377|}y\377\344\344\331\377\210\354\354\341\377\2\343" \
+  "\343\331\377\342\342\330\377\224\354\354\341\377\4\350\350\335\377\332" \
+  "\332\320\377\337\337\324\377\353\353\340\377\205\354\354\341\377\3\341" \
+  "\341\327\377\332\332\320\377\353\353\340\377\306\354\354\341\377\3\343" \
+  "\343\331\377PPP\377gl~\377\206\234\243\302\377\4\230\237\276\377\220" \
+  "\227\264\377\224\232\270\377\233\242\301\377\204\234\243\302\377\3os" \
+  "\210\377>\77@\377\327\327\315\377\213\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\213\354\354\341\377\3\241\241\232\3779;@\377\217\226" \
+  "\262\377\204\234\243\302\377\4\231\240\276\377\220\227\264\377\223\232" \
+  "\267\377\233\242\301\377\205\234\243\302\377\3\225\233\271\377>@G\377" \
+  "\232\232\225\377\225\354\354\341\377\4\340\340\326\377CDE\377gl\200\377" \
+  "\222\230\265\377\206\234\243\302\377\1\232\241\277\377\202\222\230\265" \
+  "\377\1\232\241\300\377\210\234\243\302\377\4ot\210\377:;\77\377aaa\377" \
+  "\301\301\270\377\206\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\222\354\354\341\377\4\333\333\320\377\206\206\202\377789\377EFE\377" \
+  "\206\354\354\341\377\2\335\335\322\377\336\336\323\377\312\354\354\341" \
+  "\377\3stq\377QT_\377\233\242\301\377\206\234\243\302\377\3\227\236\274" \
+  "\377\220\226\263\377\225\234\272\377\204\234\243\302\377\3\204\212\245" \
+  "\377459\377\254\254\244\377\212\354\354\341\377\2\335\335\322\377\350" \
+  "\350\335\377\211\354\354\341\377\4\340\340\326\377lmj\377NP\\\377\232" \
+  "\241\277\377\203\234\243\302\377\1\232\241\300\377\202\222\230\265\377" \
+  "\1\232\241\300\377\206\234\243\302\377\3\211\217\253\37789<\377\275\275" \
+  "\264\377\227\354\354\341\377\5\350\350\335\377ijh\377HJS\377\213\221" \
+  "\255\377\232\241\300\377\206\234\243\302\377\4\231\240\276\377\220\227" \
+  "\264\377\224\232\270\377\233\242\301\377\210\234\243\302\377\5\203\211" \
+  "\243\377PS^\377<=@\377\200\200|\377\322\322\310\377\203\354\354\341\377" \
+  "\2\343\343\331\377\342\342\330\377\217\354\354\341\377\7\337\337\325" \
+  "\377\225\226\220\377CDE\377;=C\377gk\177\377:;B\377\302\302\271\377\204" \
+  "\354\354\341\377\3\353\353\340\377\331\331\317\377\342\342\330\377\314" \
+  "\354\354\341\377\3\233\233\226\37789>\377z\177\230\377\207\234\243\302" \
+  "\377\4\225\234\272\377\220\226\263\377\223\232\267\377\231\240\276\377" \
+  "\202\234\243\302\377\5\224\233\270\377Y\\j\377<=\77\377\227\227\222\377" \
+  "\351\351\336\377\207\354\354\341\377\2\335\335\322\377\350\350\335\377" \
+  "\207\354\354\341\377\4\324\324\312\377hig\377<>C\377uz\217\377\202\234" \
+  "\243\302\377\2\233\242\301\377\226\235\273\377\202\221\230\265\377\1" \
+  "\231\240\276\377\206\234\243\302\377\4\230\237\275\377\\`o\377AAC\377" \
+  "\325\325\313\377\232\354\354\341\377\4\255\255\246\37756:\377w}\224\377" \
+  "\225\234\272\377\207\234\243\302\377\4\230\237\275\377\220\227\264\377" \
+  "\222\230\265\377\230\237\275\377\210\234\243\302\377\10\232\241\300\377" \
+  "sx\217\377GIR\377:;\77\377JKL\377\201\202~\377\265\265\255\377\332\332" \
+  "\320\377\212\354\354\341\377\13\340\340\326\377\264\264\254\377\177\200" \
+  "|\377NNO\377;<\77\377;=D\377`dv\377\221\227\264\377\233\242\301\377I" \
+  "KU\377\214\214\207\377\204\354\354\341\377\3\342\342\330\377\330\330" \
+  "\316\377\346\346\333\377\316\354\354\341\377\4\333\333\321\377ddb\377" \
+  "\77AH\377\205\213\245\377\207\234\243\302\377\13\231\240\276\377\223" \
+  "\232\267\377\220\227\264\377\222\230\265\377\227\236\274\377\234\243" \
+  "\302\377\230\237\275\377cgx\37778;\377\202\203\177\377\341\341\327\377" \
+  "\205\354\354\341\377\2\335\335\322\377\350\350\335\377\205\354\354\341" \
+  "\377\7\306\306\274\377UUU\377ACJ\377|\202\233\377\234\243\302\377\232" \
+  "\241\300\377\225\233\271\377\202\220\227\264\377\2\225\234\272\377\233" \
+  "\242\301\377\206\234\243\302\377\4\233\242\301\377hm\177\37767:\377\233" \
+  "\234\225\377\235\354\354\341\377\5\332\332\320\377HII\377UXf\377\213" \
+  "\221\255\377\227\236\274\377\207\234\243\302\377\6\232\241\277\377\224" \
+  "\233\270\377\220\227\264\377\221\230\265\377\227\235\273\377\233\242" \
+  "\301\377\210\234\243\302\377\30\224\233\270\377ty\220\377RUb\377;=C\377" \
+  "9:\77\377;<\77\377=>A\377@AB\377KLL\377DDE\377ABD\377@BD\377ABE\377@" \
+  "AE\377BCJ\377X\\j\377nr\210\377\211\217\253\377\224\233\270\377\232\241" \
+  "\277\377\234\243\302\377\226\235\273\377CEM\377\217\220\212\377\203\354" \
+  "\354\341\377\4\345\345\332\377\330\330\316\377\337\337\325\377\353\353" \
+  "\340\377\321\354\354\341\377\4\317\317\305\377RSS\377HJS\377\215\224" \
+  "\260\377\210\234\243\302\377\34\232\241\277\377\224\233\270\377\220\227" \
+  "\264\377\221\230\265\377\226\235\273\377\230\237\275\377lq\205\377;<" \
+  "A\377ABD\377\\]\\\377\204\204\200\377\254\254\244\377\317\317\305\377" \
+  "\333\333\321\377\336\336\324\377\300\300\267\377\234\234\225\377stq\377" \
+  "NOP\377<>@\377HJT\377\205\213\246\377\230\237\276\377\224\232\270\377" \
+  "\220\226\263\377\221\230\265\377\227\235\273\377\233\242\301\377\210" \
+  "\234\243\302\377\4tz\220\37778<\377\205\205\201\377\350\350\335\377\240" \
+  "\354\354\341\377\5\232\233\224\377447\377dhz\377\217\226\262\377\230" \
+  "\237\276\377\210\234\243\302\377\2\233\242\301\377\225\234\272\377\202" \
+  "\220\227\264\377\3\225\233\271\377\231\240\276\377\233\242\301\377\206" \
+  "\234\243\302\377\2\226\235\273\377\225\234\272\377\204\234\243\302\377" \
+  "\5\225\233\271\377\232\241\300\377\233\242\301\377\231\240\276\377\225" \
+  "\233\271\377\202\220\227\264\377\2\225\234\272\377\232\241\300\377\203" \
+  "\234\243\302\377\3uz\221\37767:\377\255\255\246\377\202\354\354\341\377" \
+  "\4\347\347\334\377\331\331\317\377\336\336\323\377\352\352\337\377\325" \
+  "\354\354\341\377\4\277\277\266\377CDE\377RUb\377\224\233\270\377\211" \
+  "\234\243\302\377\4\232\241\300\377\225\234\272\377\223\232\267\377\221" \
+  "\230\265\377\202\220\227\264\377\12\202\207\241\377lq\207\377[_o\377" \
+  "KNW\37789\77\377\77@H\377RUa\377aex\377uz\221\377\211\220\253\377\202" \
+  "\220\227\264\377\3\222\230\265\377\224\232\270\377\230\237\275\377\212" \
+  "\234\243\302\377\4\201\206\240\377=\77D\377opm\377\340\340\326\377\243" \
+  "\354\354\341\377\6\346\346\333\377|}y\37778<\377sw\217\377\220\227\264" \
+  "\377\232\241\277\377\211\234\243\302\377\4\233\242\301\377\227\235\273" \
+  "\377\223\232\267\377\221\230\265\377\204\220\227\264\377\6\222\230\265" \
+  "\377\224\232\270\377\220\226\263\377\217\225\262\377\224\232\270\377" \
+  "\222\230\265\377\204\220\227\264\377\4\221\230\265\377\223\232\267\377" \
+  "\227\235\273\377\233\242\301\377\204\234\243\302\377\6\222\230\265\377" \
+  "FIQ\377efd\377\343\343\331\377\354\354\341\377\351\351\336\377\202\333" \
+  "\333\321\377\1\351\351\336\377\331\354\354\341\377\4\254\254\245\377" \
+  ":;=\377^br\377\223\232\267\377\217\234\243\302\377\6\232\241\300\377" \
+  "\230\237\275\377\215\223\257\377\224\233\270\377\231\240\276\377\233" \
+  "\242\301\377\217\234\243\302\377\4\177\204\236\377FHP\377\\]\\\377\326" \
+  "\326\314\377\247\354\354\341\377\6\332\332\320\377efd\377:<A\377afx\377" \
+  "\217\225\262\377\232\241\277\377\217\234\243\302\377\6\232\241\300\377" \
+  "\230\237\276\377\221\230\265\377\220\227\264\377\230\237\276\377\232" \
+  "\241\300\377\213\234\243\302\377\10lq\205\3779:<\377\274\274\263\377" \
+  "\354\354\341\377\351\351\336\377\335\335\322\377\331\331\317\377\347" \
+  "\347\334\377\334\354\354\341\377\6\353\353\340\377\240\240\232\377PQ" \
+  "Q\377\77AF\377_cs\377\213\221\255\377\216\234\243\302\377\2\222\230\265" \
+  "\377\231\240\276\377\215\234\243\302\377\6\232\241\277\377uz\222\377" \
+  "KNW\377:;>\377kki\377\312\312\301\377\253\354\354\341\377\7\342\342\330" \
+  "\377\212\212\206\37767:\377LO[\377\201\206\240\377\223\232\267\377\230" \
+  "\237\276\377\216\234\243\302\377\2\226\235\273\377\225\234\272\377\212" \
+  "\234\243\302\377\11\224\232\270\377aew\3779;\77\377wxu\377\343\343\330" \
+  "\377\337\337\324\377\331\331\317\377\334\334\322\377\345\345\332\377" \
+  "\341\354\354\341\377\6\347\347\334\377\253\253\243\377[[[\377<=A\377" \
+  "VYf\377\201\206\240\377\213\234\243\302\377\2\222\230\265\377\231\240" \
+  "\276\377\212\234\243\302\377\6\226\235\273\377lq\206\377EGN\377>\77A" \
+  "\377z{w\377\312\312\301\377\261\354\354\341\377\7\262\262\252\377RRS" \
+  "\37789>\377MP\\\377ou\213\377\220\226\263\377\227\236\274\377\213\234" \
+  "\243\302\377\2\226\235\273\377\225\234\272\377\207\234\243\302\377\5" \
+  "\233\242\301\377uz\222\377CEL\377EFG\377\231\231\222\377\202\330\330" \
+  "\316\377\2\335\335\322\377\346\346\333\377\347\354\354\341\377\10\353" \
+  "\353\340\377\272\272\262\377ijh\377;;>\377LOX\377gl\177\377~\204\235" \
+  "\377\225\234\272\377\206\234\243\302\377\2\222\230\265\377\231\240\276" \
+  "\377\206\234\243\302\377\7\214\223\256\377ty\220\377_br\377\77AF\377" \
+  "DEF\377\213\214\206\377\326\326\314\377\266\354\354\341\377\12\353\353" \
+  "\340\377\275\275\264\377stq\377=>\77\377<>D\377RVd\377im\202\377\204" \
+  "\211\243\377\227\236\274\377\232\241\300\377\206\234\243\302\377\2\226" \
+  "\235\273\377\225\234\272\377\204\234\243\302\377\11\230\237\276\377{" \
+  "\201\231\377SVd\377569\377ppn\377\304\304\273\377\331\331\317\377\337" \
+  "\337\324\377\350\350\335\377\356\354\354\341\377\26\312\312\301\377\235" \
+  "\235\226\377stq\377NOP\377ABE\377>\77D\377>@F\377EGO\377LOY\377SVb\377" \
+  "SWd\377UYf\377QS_\377JLU\377CDL\377>\77E\377\77AE\377CDE\377\\]\\\377" \
+  "\205\205\200\377\255\255\245\377\337\337\325\377\275\354\354\341\377" \
+  "\30\335\335\322\377\263\263\253\377\207\210\203\377Z[[\377\77\77A\377" \
+  "9:\77\377<>E\377FHR\377LOZ\377RUc\377X\\l\377^bu\377bfz\377_bv\377Y]" \
+  "m\377OS_\377CEO\37779<\377\77@A\377jji\377\250\250\240\377\337\337\324" \
+  "\377\343\343\331\377\351\351\336\377\367\354\354\341\377\11\352\352\337" \
+  "\377\337\337\324\377\323\323\311\377\307\307\276\377\260\260\250\377" \
+  "\274\274\264\377\314\314\303\377\327\327\315\377\343\343\331\377\312" \
+  "\354\354\341\377\13\340\340\326\377\315\315\303\377\302\302\271\377\267" \
+  "\267\256\377\252\252\243\377\237\237\230\377\214\214\207\377\222\222" \
+  "\213\377\254\254\244\377\277\277\266\377\325\325\313\377\377\354\354" \
+  "\341\377\203\354\354\341\377\2\335\335\322\377\350\350\335\377\323\354" \
+  "\354\341\377\2\343\343\331\377\342\342\330\377\377\354\354\341\377\206" \
+  "\354\354\341\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377" \
+  "\2\343\343\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341" \
+  "\377\2\335\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343" \
+  "\331\377\342\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335" \
+  "\335\322\377\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342" \
+  "\342\330\377\377\354\354\341\377\206\354\354\341\377\2\335\335\322\377" \
+  "\350\350\335\377\323\354\354\341\377\2\343\343\331\377\342\342\330\377" \
+  "\377\354\354\341\377\206\354\354\341\377\2\352\352\337\377\353\353\340" \
+  "\377\323\354\354\341\377\2\353\353\340\377\352\352\337\377\377\354\354" \
+  "\341\377\377\354\354\341\377\377\354\354\341\377\377\354\354\341\377" \
+  "\377\354\354\341\377\377\354\354\341\377\377\354\354\341\377\377\354" \
+  "\354\341\377\377\354\354\341\377\377\354\354\341\377\377\354\354\341" \
+  "\377\355\354\354\341\377\2\245\245\242\377\230\230\227\377\233\354\354" \
+  "\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377\211\354\354" \
+  "\341\377\2\245\245\242\377\232\232\231\377\225\354\354\341\377\2\223" \
+  "\223\223\377\254\254\251\377\377\354\354\341\377\233\354\354\341\377" \
+  "\2\245\245\242\377\230\230\227\377\233\354\354\341\377\3\302\302\274" \
+  "\377\222\222\222\377\327\327\317\377\211\354\354\341\377\2\245\245\242" \
+  "\377\232\232\231\377\225\354\354\341\377\2\223\223\223\377\254\254\251" \
+  "\377\377\354\354\341\377\233\354\354\341\377\2\245\245\242\377\230\230" \
+  "\227\377\233\354\354\341\377\3\302\302\274\377\222\222\222\377\327\327" \
+  "\317\377\211\354\354\341\377\2\245\245\242\377\232\232\231\377\225\354" \
+  "\354\341\377\2\223\223\223\377\254\254\251\377\317\354\354\341\377\3" \
+  "\337\337\325\377\274\274\264\377\324\324\312\377\212\354\354\341\377" \
+  "\3\314\314\303\377\306\306\275\377\353\353\340\377\207\354\354\341\377" \
+  "\4\347\347\334\377\302\302\271\377\310\310\277\377\350\350\335\377\210" \
+  "\354\354\341\377\4\352\352\337\377\306\306\274\377\311\311\300\377\352" \
+  "\352\337\377\211\354\354\341\377\4\353\353\340\377\337\337\326\377\333" \
+  "\333\322\377\350\350\335\377\211\354\354\341\377\202\340\340\326\377" \
+  "\204\354\354\341\377\3\350\350\335\377\332\332\321\377\343\343\331\377" \
+  "\205\354\354\341\377\2\245\245\242\377\230\230\227\377\202\354\354\341" \
+  "\377\3\343\343\331\377\333\333\322\377\352\352\337\377\207\354\354\341" \
+  "\377\4\353\353\340\377\337\337\325\377\333\333\322\377\350\350\336\377" \
+  "\207\354\354\341\377\1\352\352\340\377\202\334\334\323\377\4\351\351" \
+  "\336\377\302\302\274\377\222\222\222\377\327\327\317\377\205\354\354" \
+  "\341\377\6\347\347\335\377\331\331\320\377\340\340\326\377\354\354\341" \
+  "\377\245\245\242\377\232\232\231\377\206\354\354\341\377\3\347\347\334" \
+  "\377\331\331\320\377\342\342\330\377\210\354\354\341\377\6\344\344\332" \
+  "\377\330\330\320\377\342\342\330\377\354\354\341\377\223\223\223\377" \
+  "\254\254\251\377\315\354\354\341\377\2\323\323\312\377==:\377\203\0\0" \
+  "\0\377\2\37\37\36\377\264\264\254\377\204\354\354\341\377\4\7\7\7\377" \
+  "EEB\377\215\215\207\377\24\24\23\377\202\0\0\0\377\2\22\22\21\377\260" \
+  "\260\250\377\204\354\354\341\377\3\336\336\323\377XXT\377\5\5\5\377\202" \
+  "\0\0\0\377\3\11\11\10\377\206\206\177\377\353\353\340\377\202\354\354" \
+  "\341\377\5\267\267\256\377\6\6\6\377xxr\377||v\377\15\15\15\377\202\0" \
+  "\0\0\377\2!!\37\377\300\300\267\377\206\354\354\341\377\3\353\353\340" \
+  "\377\302\302\274\377\226\226\226\377\203\222\222\222\377\2\266\266\262" \
+  "\377\350\350\335\377\203\354\354\341\377\4\225\225\224\377\254\254\251" \
+  "\377\314\314\305\377\233\233\232\377\202\222\222\222\377\5\236\236\234" \
+  "\377\336\336\325\377\343\343\331\377\256\256\252\377\223\223\222\377" \
+  "\202\222\222\222\377\2\260\260\254\377\351\351\336\377\203\354\354\341" \
+  "\377\4\245\245\242\377\230\230\227\377\324\324\313\377\240\240\236\377" \
+  "\202\222\222\222\377\2\224\224\224\377\310\310\301\377\204\354\354\341" \
+  "\377\3\352\352\340\377\300\300\272\377\226\226\226\377\203\222\222\222" \
+  "\377\2\270\270\263\377\350\350\335\377\203\354\354\341\377\3\353\353" \
+  "\340\377\303\303\275\377\225\225\225\377\202\222\222\222\377\4\227\227" \
+  "\226\377\241\241\237\377\222\222\222\377\327\327\317\377\203\354\354" \
+  "\341\377\2\345\345\333\377\256\256\253\377\203\222\222\222\377\3\237" \
+  "\237\235\377\231\231\230\377\232\232\231\377\204\354\354\341\377\2\333" \
+  "\333\322\377\244\244\242\377\203\222\222\222\377\2\237\237\235\377\327" \
+  "\327\317\377\204\354\354\341\377\2\336\336\325\377\245\245\242\377\203" \
+  "\222\222\222\377\3\246\246\243\377\222\222\222\377\254\254\251\377\314" \
+  "\354\354\341\377\11\337\337\325\377\30\30\27\377\7\7\7\377vvp\377\253" \
+  "\253\243\377\216\216\207\377\33\33\32\377\2\2\2\377\264\264\254\377\203" \
+  "\354\354\341\377\202\0\0\0\377\7\11\11\10\377YYU\377\206\206\177\377" \
+  "cc^\377\3\3\3\377\6\6\6\377\320\320\306\377\202\354\354\341\377\11\345" \
+  "\345\332\377$$\"\377\17\17\17\377\202\202|\377\272\272\261\377\255\255" \
+  "\245\377HHD\377\0\0\0\377\225\225\216\377\202\354\354\341\377\12\265" \
+  "\265\254\377\0\0\0\377\4\4\4\377\21\21\20\377``[\377\210\210\201\377" \
+  "SSO\377\0\0\0\377**(\377\352\352\337\377\205\354\354\341\377\10\262\262" \
+  "\256\377\223\223\223\377\271\271\264\377\325\325\315\377\327\327\316" \
+  "\377\273\273\266\377\222\222\222\377\264\264\260\377\203\354\354\341" \
+  "\377\17\222\222\222\377\223\223\223\377\224\224\224\377\263\263\257\377" \
+  "\305\305\276\377\265\265\261\377\222\222\222\377\234\234\232\377\230" \
+  "\230\227\377\237\237\235\377\274\274\266\377\303\303\275\377\243\243" \
+  "\241\377\222\222\222\377\306\306\277\377\203\354\354\341\377\1\245\245" \
+  "\242\377\202\222\222\222\377\6\254\254\251\377\302\302\274\377\276\276" \
+  "\270\377\231\231\230\377\222\222\222\377\321\321\311\377\203\354\354" \
+  "\341\377\3\260\260\254\377\223\223\223\377\272\272\265\377\202\326\326" \
+  "\316\377\3\271\271\265\377\222\222\222\377\267\267\263\377\203\354\354" \
+  "\341\377\11\274\274\266\377\222\222\222\377\244\244\242\377\305\305\276" \
+  "\377\313\313\304\377\275\275\267\377\234\234\233\377\222\222\222\377" \
+  "\327\327\317\377\202\354\354\341\377\11\352\352\337\377\240\240\236\377" \
+  "\222\222\222\377\262\262\256\377\312\312\303\377\311\311\302\377\263" \
+  "\263\257\377\224\224\224\377\232\232\231\377\203\354\354\341\377\11\330" \
+  "\330\317\377\224\224\223\377\242\242\240\377\315\315\306\377\332\332" \
+  "\321\377\314\314\305\377\236\236\234\377\225\225\225\377\342\342\330" \
+  "\377\202\354\354\341\377\11\342\342\330\377\226\226\226\377\224\224\224" \
+  "\377\272\272\265\377\314\314\305\377\306\306\300\377\255\255\252\377" \
+  "\222\222\222\377\254\254\251\377\314\354\354\341\377\3ppk\377\0\0\0\377" \
+  "\234\234\225\377\203\354\354\341\377\4\322\322\310\377\7\7\7\37700-\377" \
+  "\353\353\340\377\202\354\354\341\377\3\0\0\0\377$$\"\377\321\321\307" \
+  "\377\203\354\354\341\377\3\217\217\210\377\0\0\0\377eea\377\202\354\354" \
+  "\341\377\3{{u\377\0\0\0\377\233\233\224\377\203\354\354\341\377\3\344" \
+  "\344\331\377\12\12\11\377\36\36\35\377\202\354\354\341\377\4\265\265" \
+  "\254\377\0\0\0\377@@=\377\332\332\320\377\203\354\354\341\377\3@@=\377" \
+  "\0\0\0\377\310\310\277\377\204\354\354\341\377\3\326\326\316\377\222" \
+  "\222\222\377\267\267\263\377\204\354\354\341\377\3\250\250\246\377\222" \
+  "\222\222\377\341\341\327\377\202\354\354\341\377\3\222\222\222\377\235" \
+  "\235\233\377\336\336\324\377\203\354\354\341\377\4\261\261\255\377\222" \
+  "\222\222\377\272\272\265\377\352\352\337\377\202\354\354\341\377\3\344" \
+  "\344\332\377\222\222\222\377\252\252\247\377\203\354\354\341\377\3\245" \
+  "\245\242\377\224\224\224\377\331\331\320\377\203\354\354\341\377\3\333" \
+  "\333\322\377\222\222\222\377\246\246\243\377\202\354\354\341\377\3\324" \
+  "\324\313\377\222\222\222\377\272\272\265\377\204\354\354\341\377\10\246" \
+  "\246\243\377\223\223\222\377\343\343\331\377\354\354\341\377\336\336" \
+  "\325\377\223\223\223\377\246\246\243\377\351\351\337\377\203\354\354" \
+  "\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377\202\354\354" \
+  "\341\377\3\303\303\275\377\222\222\222\377\301\301\273\377\204\354\354" \
+  "\341\377\2\245\245\242\377\232\232\231\377\202\354\354\341\377\4\353" \
+  "\353\340\377\245\245\242\377\225\225\225\377\346\346\333\377\203\354" \
+  "\354\341\377\3\321\321\311\377\222\222\222\377\272\272\265\377\202\354" \
+  "\354\341\377\3\261\261\255\377\222\222\222\377\323\323\313\377\204\354" \
+  "\354\341\377\2\223\223\223\377\254\254\251\377\314\354\354\341\377\3" \
+  "&&%\377\23\23\22\377\352\352\337\377\204\354\354\341\377\3SSO\377\0\0" \
+  "\0\377\322\322\310\377\202\354\354\341\377\2\0\0\0\377AA>\377\204\354" \
+  "\354\341\377\3\346\346\333\377\7\7\7\377//-\377\202\354\354\341\377\3" \
+  "))'\377\34\34\33\377\351\351\336\377\204\354\354\341\377\7LLI\377\0\0" \
+  "\0\377\340\340\326\377\354\354\341\377\265\265\254\377\0\0\0\377yys\377" \
+  "\204\354\354\341\377\3xxr\377\0\0\0\377\254\254\244\377\204\354\354\341" \
+  "\377\3\267\267\263\377\222\222\222\377\337\337\325\377\204\354\354\341" \
+  "\377\3\305\305\276\377\222\222\222\377\322\322\312\377\202\354\354\341" \
+  "\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377\3\300\300" \
+  "\273\377\222\222\222\377\322\322\312\377\204\354\354\341\377\2\234\234" \
+  "\232\377\236\236\235\377\203\354\354\341\377\2\245\245\242\377\230\230" \
+  "\227\377\205\354\354\341\377\7\244\244\242\377\222\222\222\377\352\352" \
+  "\337\377\354\354\341\377\264\264\260\377\223\223\223\377\341\341\327" \
+  "\377\204\354\354\341\377\7\302\302\274\377\222\222\222\377\325\325\314" \
+  "\377\354\354\341\377\303\303\275\377\222\222\222\377\317\317\310\377" \
+  "\204\354\354\341\377\3\302\302\274\377\222\222\222\377\327\327\317\377" \
+  "\202\354\354\341\377\3\245\245\243\377\226\226\225\377\350\350\336\377" \
+  "\204\354\354\341\377\2\245\245\242\377\232\232\231\377\202\354\354\341" \
+  "\377\3\340\340\326\377\222\222\222\377\267\267\263\377\204\354\354\341" \
+  "\377\7\351\351\336\377\225\225\225\377\252\252\247\377\354\354\341\377" \
+  "\353\353\340\377\224\224\224\377\244\244\242\377\205\354\354\341\377" \
+  "\2\223\223\223\377\254\254\251\377\313\354\354\341\377\3\353\353\340" \
+  "\377\7\7\7\37711/\377\205\354\354\341\377\3ssn\377\0\0\0\377\260\260" \
+  "\250\377\202\354\354\341\377\2\0\0\0\377AA>\377\205\354\354\341\377\5" \
+  "\37\37\36\377\24\24\23\377\354\354\341\377\352\352\337\377\7\7\7\377" \
+  "\210\0\0\0\377\5\306\306\274\377\354\354\341\377\265\265\254\377\0\0" \
+  "\0\377yys\377\204\354\354\341\377\3\207\207\200\377\0\0\0\377\245\245" \
+  "\235\377\204\354\354\341\377\1\252\252\247\377\210\222\222\222\377\1" \
+  "\310\310\301\377\202\354\354\341\377\2\222\222\222\377\252\252\247\377" \
+  "\204\354\354\341\377\3\304\304\276\377\222\222\222\377\322\322\312\377" \
+  "\204\354\354\341\377\2\240\240\236\377\234\234\233\377\203\354\354\341" \
+  "\377\2\245\245\242\377\230\230\227\377\205\354\354\341\377\5\260\260" \
+  "\254\377\222\222\222\377\341\341\327\377\354\354\341\377\247\247\244" \
+  "\377\210\222\222\222\377\5\312\312\303\377\354\354\341\377\265\265\261" \
+  "\377\222\222\222\377\340\340\326\377\204\354\354\341\377\3\302\302\274" \
+  "\377\222\222\222\377\327\327\317\377\202\354\354\341\377\2\230\230\227" \
+  "\377\243\243\241\377\205\354\354\341\377\2\245\245\242\377\232\232\231" \
+  "\377\202\354\354\341\377\1\322\322\312\377\210\222\222\222\377\5\237" \
+  "\237\235\377\354\354\341\377\340\340\327\377\222\222\222\377\265\265" \
+  "\260\377\205\354\354\341\377\2\223\223\223\377\254\254\251\377\313\354" \
+  "\354\341\377\3\347\347\334\377\1\1\1\377885\377\205\354\354\341\377\3" \
+  "{{u\377\0\0\0\377\247\247\237\377\202\354\354\341\377\2\0\0\0\377AA>" \
+  "\377\205\354\354\341\377\6\40\40\36\377\30\30\26\377\354\354\341\377" \
+  "\344\344\331\377\0\0\0\377++)\377\207\241\241\232\377\5\337\337\325\377" \
+  "\354\354\341\377\265\265\254\377\0\0\0\377yys\377\204\354\354\341\377" \
+  "\3\210\210\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377\2\245" \
+  "\245\242\377\223\223\223\377\207\317\317\310\377\1\340\340\327\377\202" \
+  "\354\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377" \
+  "\3\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \
+  "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\2\245\245\242" \
+  "\377\230\230\227\377\205\354\354\341\377\6\262\262\256\377\222\222\222" \
+  "\377\342\342\330\377\354\354\341\377\242\242\240\377\225\225\225\377" \
+  "\207\317\317\310\377\5\341\341\327\377\354\354\341\377\257\257\254\377" \
+  "\222\222\222\377\345\345\333\377\204\354\354\341\377\7\302\302\274\377" \
+  "\222\222\222\377\327\327\317\377\354\354\341\377\353\353\340\377\223" \
+  "\223\222\377\250\250\245\377\205\354\354\341\377\2\245\245\242\377\232" \
+  "\232\231\377\202\354\354\341\377\3\315\315\306\377\222\222\222\377\266" \
+  "\266\261\377\206\317\317\310\377\5\324\324\313\377\354\354\341\377\332" \
+  "\332\321\377\222\222\222\377\272\272\265\377\205\354\354\341\377\2\223" \
+  "\223\223\377\254\254\251\377\314\354\354\341\377\202\35\35\34\377\205" \
+  "\354\354\341\377\3``[\377\0\0\0\377\307\307\276\377\202\354\354\341\377" \
+  "\2\0\0\0\377AA>\377\204\354\354\341\377\3\350\350\335\377\6\6\6\377<" \
+  "<9\377\202\354\354\341\377\2\34\34\33\377\35\35\34\377\211\354\354\341" \
+  "\377\3\265\265\254\377\0\0\0\377yys\377\204\354\354\341\377\3\210\210" \
+  "\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377\3\262\262\256" \
+  "\377\222\222\222\377\341\341\330\377\211\354\354\341\377\2\222\222\222" \
+  "\377\252\252\247\377\204\354\354\341\377\3\305\305\276\377\222\222\222" \
+  "\377\322\322\312\377\204\354\354\341\377\2\240\240\236\377\234\234\233" \
+  "\377\203\354\354\341\377\2\245\245\242\377\230\230\227\377\205\354\354" \
+  "\341\377\2\247\247\245\377\226\226\226\377\202\354\354\341\377\3\260" \
+  "\260\254\377\222\222\222\377\344\344\332\377\210\354\354\341\377\3\271" \
+  "\271\264\377\222\222\222\377\334\334\323\377\204\354\354\341\377\3\302" \
+  "\302\274\377\222\222\222\377\327\327\317\377\202\354\354\341\377\2\233" \
+  "\233\232\377\237\237\235\377\205\354\354\341\377\2\245\245\242\377\232" \
+  "\232\231\377\202\354\354\341\377\3\332\332\321\377\222\222\222\377\271" \
+  "\271\264\377\210\354\354\341\377\3\344\344\332\377\222\222\222\377\261" \
+  "\261\255\377\205\354\354\341\377\2\223\223\223\377\254\254\251\377\314" \
+  "\354\354\341\377\3RRN\377\0\0\0\377\272\272\262\377\203\354\354\341\377" \
+  "\1\343\343\331\377\202\25\25\24\377\1\347\347\334\377\202\354\354\341" \
+  "\377\2\0\0\0\377AA>\377\204\354\354\341\377\3\222\222\213\377\0\0\0\377" \
+  "zzt\377\202\354\354\341\377\3RRN\377\0\0\0\377\240\240\230\377\205\354" \
+  "\354\341\377\1\332\332\320\377\202\354\354\341\377\3\265\265\254\377" \
+  "\0\0\0\377yys\377\204\354\354\341\377\3\210\210\202\377\0\0\0\377\245" \
+  "\245\235\377\204\354\354\341\377\3\307\307\300\377\222\222\222\377\271" \
+  "\271\264\377\205\354\354\341\377\2\351\351\336\377\350\350\335\377\202" \
+  "\354\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377" \
+  "\3\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \
+  "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\2\245\245\242" \
+  "\377\230\230\227\377\204\354\354\341\377\3\337\337\325\377\223\223\223" \
+  "\377\254\254\250\377\202\354\354\341\377\3\304\304\276\377\222\222\222" \
+  "\377\274\274\266\377\205\354\354\341\377\202\350\350\336\377\4\354\354" \
+  "\341\377\310\310\302\377\222\222\222\377\277\277\272\377\204\354\354" \
+  "\341\377\3\274\274\267\377\222\222\222\377\327\327\317\377\202\354\354" \
+  "\341\377\3\253\253\247\377\222\222\222\377\335\335\323\377\203\354\354" \
+  "\341\377\3\352\352\337\377\241\241\237\377\232\232\231\377\202\354\354" \
+  "\341\377\4\350\350\336\377\230\230\227\377\231\231\230\377\343\343\331" \
+  "\377\205\354\354\341\377\6\345\345\333\377\354\354\341\377\353\353\340" \
+  "\377\231\231\230\377\230\230\227\377\350\350\336\377\203\354\354\341" \
+  "\377\3\346\346\334\377\223\223\222\377\254\254\251\377\314\354\354\341" \
+  "\377\11\312\312\301\377\5\5\5\377\"\"\40\377\271\271\260\377\351\351" \
+  "\336\377\321\321\307\377GGC\377\0\0\0\377\216\216\207\377\203\354\354" \
+  "\341\377\11\0\0\0\377\31\31\30\377\221\221\212\377\306\306\274\377\305" \
+  "\305\273\377\203\203}\377\10\10\7\377\35\35\34\377\344\344\331\377\202" \
+  "\354\354\341\377\1\321\321\307\377\202\13\13\12\377\6\206\206\177\377" \
+  "\320\320\306\377\336\336\323\377\257\257\247\377nni\377\26\26\25\377" \
+  "\202\354\354\341\377\3\265\265\254\377\0\0\0\377yys\377\204\354\354\341" \
+  "\377\3\210\210\202\377\0\0\0\377\245\245\235\377\204\354\354\341\377" \
+  "\12\352\352\337\377\242\242\240\377\222\222\222\377\270\270\263\377\336" \
+  "\336\324\377\350\350\335\377\331\331\320\377\304\304\275\377\234\234" \
+  "\232\377\332\332\321\377\202\354\354\341\377\2\222\222\222\377\252\252" \
+  "\247\377\204\354\354\341\377\3\305\305\276\377\222\222\222\377\322\322" \
+  "\312\377\204\354\354\341\377\2\240\240\236\377\234\234\233\377\203\354" \
+  "\354\341\377\11\245\245\242\377\224\224\224\377\310\310\301\377\341\341" \
+  "\327\377\347\347\335\377\325\325\315\377\240\240\237\377\222\222\222" \
+  "\377\333\333\322\377\202\354\354\341\377\22\352\352\337\377\240\240\237" \
+  "\377\222\222\222\377\271\271\265\377\336\336\325\377\350\350\335\377" \
+  "\331\331\320\377\303\303\275\377\233\233\232\377\335\335\324\377\354" \
+  "\354\341\377\350\350\336\377\231\231\230\377\224\224\224\377\306\306" \
+  "\300\377\336\336\324\377\321\321\312\377\260\260\254\377\202\222\222" \
+  "\222\377\1\327\327\317\377\202\354\354\341\377\11\323\323\313\377\222" \
+  "\222\222\377\237\237\236\377\322\322\313\377\335\335\324\377\312\312" \
+  "\303\377\240\240\237\377\222\222\222\377\232\232\231\377\203\354\354" \
+  "\341\377\11\311\311\302\377\222\222\222\377\240\240\236\377\322\322\312" \
+  "\377\345\345\333\377\342\342\330\377\317\317\307\377\256\256\253\377" \
+  "\262\262\256\377\202\354\354\341\377\11\301\301\273\377\222\222\222\377" \
+  "\252\252\247\377\327\327\317\377\333\333\322\377\304\304\276\377\232" \
+  "\232\231\377\222\222\222\377\254\254\251\377\315\354\354\341\377\10\244" \
+  "\244\235\377\20\20\17\377\0\0\0\377\3\3\3\377\0\0\0\377\2\2\2\377uup" \
+  "\377\352\352\337\377\203\354\354\341\377\3\0\0\0\377\14\14\13\377\4\4" \
+  "\4\377\203\0\0\0\377\2))'\377\307\307\276\377\204\354\354\341\377\2\267" \
+  "\267\256\377++)\377\205\0\0\0\377\1""996\377\202\354\354\341\377\3\265" \
+  "\265\254\377\0\0\0\377yys\377\204\354\354\341\377\3\210\210\202\377\0" \
+  "\0\0\377\245\245\235\377\205\354\354\341\377\2\341\341\330\377\256\256" \
+  "\252\377\205\222\222\222\377\2\235\235\234\377\340\340\327\377\202\354" \
+  "\354\341\377\2\222\222\222\377\252\252\247\377\204\354\354\341\377\3" \
+  "\305\305\276\377\222\222\222\377\322\322\312\377\204\354\354\341\377" \
+  "\2\240\240\236\377\234\234\233\377\203\354\354\341\377\3\245\245\242" \
+  "\377\223\223\223\377\225\225\225\377\203\222\222\222\377\2\225\225\225" \
+  "\377\314\314\305\377\204\354\354\341\377\2\340\340\327\377\254\254\251" \
+  "\377\205\222\222\222\377\2\236\236\234\377\342\342\330\377\202\354\354" \
+  "\341\377\2\324\324\314\377\227\227\226\377\203\222\222\222\377\4\241" \
+  "\241\237\377\261\261\255\377\222\222\222\377\327\327\317\377\203\354" \
+  "\354\341\377\1\274\274\267\377\204\222\222\222\377\3\261\261\255\377" \
+  "\240\240\236\377\232\232\231\377\204\354\354\341\377\2\306\306\300\377" \
+  "\230\230\227\377\204\222\222\222\377\2\224\224\224\377\301\301\273\377" \
+  "\202\354\354\341\377\2\350\350\336\377\256\256\252\377\203\222\222\222" \
+  "\377\4\223\223\223\377\275\275\270\377\223\223\222\377\254\254\251\377" \
+  "\316\354\354\341\377\5\326\326\314\377\236\236\226\377zzt\377\222\222" \
+  "\213\377\306\306\275\377\205\354\354\341\377\7\0\0\0\377AA>\377\327\327" \
+  "\315\377\236\236\226\377\216\216\207\377\265\265\254\377\346\346\333" \
+  "\377\206\354\354\341\377\6\351\351\336\377\267\267\256\377\223\223\214" \
+  "\377\177\177y\377\233\233\224\377\312\312\301\377\203\354\354\341\377" \
+  "\3\337\337\324\377\260\260\250\377\317\317\305\377\204\354\354\341\377" \
+  "\3\323\323\312\377\260\260\250\377\332\332\320\377\207\354\354\341\377" \
+  "\5\334\334\323\377\315\315\306\377\302\302\274\377\312\312\303\377\331" \
+  "\331\320\377\204\354\354\341\377\2\325\325\315\377\333\333\322\377\204" \
+  "\354\354\341\377\3\342\342\330\377\325\325\315\377\345\345\333\377\204" \
+  "\354\354\341\377\2\331\331\320\377\330\330\317\377\203\354\354\341\377" \
+  "\7\332\332\321\377\331\331\320\377\346\346\334\377\314\314\305\377\300" \
+  "\300\272\377\312\312\303\377\341\341\327\377\207\354\354\341\377\5\334" \
+  "\334\323\377\314\314\305\377\302\302\274\377\312\312\303\377\332\332" \
+  "\321\377\205\354\354\341\377\10\342\342\330\377\312\312\303\377\302\302" \
+  "\274\377\322\322\313\377\351\351\337\377\341\341\330\377\325\325\315" \
+  "\377\347\347\334\377\204\354\354\341\377\7\330\330\320\377\304\304\275" \
+  "\377\306\306\300\377\332\332\321\377\354\354\341\377\332\332\321\377" \
+  "\327\327\317\377\205\354\354\341\377\6\346\346\333\377\323\323\313\377" \
+  "\305\305\277\377\305\305\276\377\321\321\311\377\346\346\334\377\204" \
+  "\354\354\341\377\10\353\353\340\377\323\323\313\377\301\301\273\377\312" \
+  "\312\303\377\340\340\326\377\354\354\341\377\326\326\315\377\334\334" \
+  "\323\377\330\354\354\341\377\2\0\0\0\377AA>\377\377\354\354\341\377\333" \
+  "\354\354\341\377\2\0\0\0\377AA>\377\377\354\354\341\377\333\354\354\341" \
+  "\377\2\0\0\0\377AA>\377\377\354\354\341\377\240\354\354\341\377")
 
 
diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init
index 3a5cb653aa..a966638074 100644
--- a/packages/psplash/files/psplash-init
+++ b/packages/psplash/files/psplash-init
@@ -1,6 +1,16 @@
 #!/bin/sh 
 
+for x in $(cat /proc/cmdline); do
+        case $x in
+        psplash=false)
+		echo "Boot splashscreen disabled" 
+		exit 0;
+                ;;
+        esac
+done
+
 export TMPDIR=/mnt/.psplash
 mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
 /usr/bin/psplash &
+
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index e2bdbce4b7..eebe2179da 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND
diff --git a/packages/quagga/quagga_0.99.3.bb b/packages/quagga/quagga_0.99.6.bb
index 5b3f76a762..6bcc251730 100644
--- a/packages/quagga/quagga_0.99.3.bb
+++ b/packages/quagga/quagga_0.99.6.bb
@@ -1,3 +1,3 @@
-PR = "r4"
+PR = "r0"
 
 require quagga.inc
diff --git a/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty b/packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty
+++ b/packages/reiserfsprogs/reiserfsprogs-3.6.19/.mtn2git_empty
diff --git a/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
new file mode 100644
index 0000000000..a117f2c19b
--- /dev/null
+++ b/packages/reiserfsprogs/reiserfsprogs-3.6.19/header-fix.patch
@@ -0,0 +1,33 @@
+--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 19:29:45.240611000 -0400
++++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 19:30:29.588212000 -0400
+@@ -38,15 +38,22 @@
+ # define extern_inline
+ #endif
+ 
+-#include <asm/unaligned.h>
++#define get_unaligned(ptr)                  \
++({                                             \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v;                               \
++})
++
++#define put_unaligned(val, ptr)             \
++do {                                           \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v = (val);                       \
++} while(0)
+ 
+-#ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-#	define get_unaligned(ptr)	(*(ptr))
+-#	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+-#endif
+-#endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
+ #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)
diff --git a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
index 7738f5370c..6a5c01f0fd 100644
--- a/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
+++ b/packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
@@ -2,8 +2,12 @@ DESCRIPTION = "User-level tools for ReiserFS filesystems"
 SECTION = "base"
 LICENSE = "GPL"
 RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs"
+PR = "r1"
+
+SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+	  file://header-fix.patch;patch=1 \
+	  "
 
-SRC_URI = "ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz"
 S = "${WORKDIR}/reiserfsprogs-${PV}"
 
 inherit autotools
diff --git a/packages/scw/scw_0.4.2.bb b/packages/scw/scw_0.4.3.bb
index 68d18ecb6c..759f901d69 100644
--- a/packages/scw/scw_0.4.2.bb
+++ b/packages/scw/scw_0.4.3.bb
@@ -3,8 +3,7 @@ HOMEPAGE = "http://corrie.scp.fi/users/kalle.vahlman/scw/"
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
 
-
-SRC_URI = "http://corrie.scp.fi/users/kalle.vahlman/scw/${P}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
 
 inherit autotools pkgconfig
 
diff --git a/packages/ssmtp/ssmtp-2.60.9/.mtn2git_empty b/packages/ssmtp/ssmtp-2.60.9/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ssmtp/ssmtp-2.60.9/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ssmtp/ssmtp-2.60.9/configure.patch b/packages/ssmtp/ssmtp-2.60.9/configure.patch
deleted file mode 100644
index 2feaa8a80c..0000000000
--- a/packages/ssmtp/ssmtp-2.60.9/configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- ssmtp-2.60/./configure.in~configure
-+++ ssmtp-2.60/./configure.in
-@@ -1,5 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(ssmtp.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([ssmtp.c])
- 
- dnl Checks for programs.
- AC_PROG_INSTALL
-@@ -13,8 +14,7 @@
- 
- 
- AC_CACHE_CHECK([for obsolete openlog],ssmtp_cv_obsolete_openlog,
--	[ AC_TRY_COMPILE([#include <syslog.h> ] , [ openlog("xx",1); ] , 
--	ssmtp_cv_obsolete_openlog=yes, ssmtp_cv_obsolete_openlog=no)]
-+	[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <syslog.h>  ]], [[ openlog("xx",1);  ]])],[ssmtp_cv_obsolete_openlog=yes],[ssmtp_cv_obsolete_openlog=no])]
- )
- 
- 
-@@ -70,4 +70,5 @@
- fi
- enableval=""
- 
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
diff --git a/packages/ssmtp/ssmtp-2.60.9/ldflags.patch b/packages/ssmtp/ssmtp-2.60.9/ldflags.patch
deleted file mode 100644
index 0cbda2c85d..0000000000
--- a/packages/ssmtp/ssmtp-2.60.9/ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- ssmtp-2.60/Makefile.in~ldflags
-+++ ssmtp-2.60/Makefile.in
-@@ -36,6 +36,7 @@
- 
- 
- CFLAGS=-Wall @DEFS@ $(EXTRADEFS) @CFLAGS@
-+LDFLAGS=@LDFLAGS@
- 
- .PHONY: all
- all: ssmtp
-@@ -78,7 +79,7 @@
- 
- # Binaries:
- ssmtp: $(OBJS)
--	$(CC) -o ssmtp $(OBJS) @LIBS@
-+	$(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@
- 
- .PHONY: clean
- clean:
diff --git a/packages/ssmtp/ssmtp-2.60.9/ssmtp.conf b/packages/ssmtp/ssmtp-2.60.9/ssmtp.conf
deleted file mode 100644
index 201292f8b9..0000000000
--- a/packages/ssmtp/ssmtp-2.60.9/ssmtp.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# /etc/ssmtp.conf -- a config file for sSMTP sendmail.
-#
-# The person who gets all mail for userids < 1000
-root=postmaster
-# The place where the mail goes. The actual machine name is required
-# no MX records are consulted. Commonly mailhosts are named mail.domain.com
-# The example will fit if you are in domain.com and you mailhub is so named.
-mailhub=mail
-# Where will the mail seem to come from?
-#rewriteDomain=localhost.localdomain
-# The full hostname
-hostname=localhost.localdomain
diff --git a/packages/ssmtp/ssmtp_2.60.9.bb b/packages/ssmtp/ssmtp_2.60.9.bb
deleted file mode 100644
index e0381db640..0000000000
--- a/packages/ssmtp/ssmtp_2.60.9.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "console/network"
-DEPENDS = "openssl"
-DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub."
-LICENSE = "GPL"
-SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.tar.gz \
-           file://ldflags.patch;patch=1 \
-           file://configure.patch;patch=1 \
-           file://ssmtp.conf"
-S = "${WORKDIR}/${PN}-2.60"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-ssl"
-do_compile () {
-	oe_runmake 'LDFLAGS=${LDFLAGS}'
-}
-
-do_install () {
-	oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \
-		   'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \
-		   'etcdir=${D}${sysconfdir}' GEN_CONFIG="`which echo`" install
-	install -d ${D}${sysconfdir}/ssmtp
-	install -m 0644 ${WORKDIR}/ssmtp.conf ${D}${sysconfdir}/ssmtp/ssmtp.conf
-}
diff --git a/packages/stunnel/stunnel-4.05/.mtn2git_empty b/packages/stunnel/stunnel-4.05/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/stunnel/stunnel-4.05/.mtn2git_empty
+++ /dev/null
diff --git a/packages/stunnel/stunnel-4.05/automake.patch b/packages/stunnel/stunnel-4.05/automake.patch
deleted file mode 100644
index a1baa151d5..0000000000
--- a/packages/stunnel/stunnel-4.05/automake.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN stunnel-4.05.orig/Makefile.am stunnel-4.05/Makefile.am
---- stunnel-4.05.orig/Makefile.am	2003-01-11 23:30:48.000000000 -0500
-+++ stunnel-4.05/Makefile.am	2004-03-21 20:57:58.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = src doc tools
-+SUBDIRS = src doc
- 
- # extra_src = src/gui.c src/resources.rc src/stunnel.ico src/stunnel.exe
- # extra_doc = doc/stunnel.pod doc/stunnel.8 doc/stunnel.html doc/en doc/pl
diff --git a/packages/stunnel/stunnel-4.05/configure.patch b/packages/stunnel/stunnel-4.05/configure.patch
deleted file mode 100644
index 5764796aaa..0000000000
--- a/packages/stunnel/stunnel-4.05/configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: stunnel-4.05/configure.ac
-===================================================================
---- stunnel-4.05.orig/configure.ac	2003-12-28 15:47:49.000000000 -0500
-+++ stunnel-4.05/configure.ac	2005-04-01 22:14:39.751121880 -0500
-@@ -176,8 +176,30 @@
- [AC_MSG_RESULT([no])]; LIBS="$saved_LIBS")
- 
- dnl Check PTY device files.
--AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
--AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
-+AC_ARG_WITH(ptmx,
-+    [  --with-ptmx      /dev/ptmx exists (default: check for existance)],
-+    [
-+        if test x"$withval" = "xyes"; then
-+           AC_DEFINE(HAVE_DEV_PTMX)
-+        fi
-+    ],
-+    [
-+        # Check for ptmx device
-+        AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
-+    ]
-+)
-+AC_ARG_WITH(ptc,
-+    [  --with-ptc      /dev/ptc exists (default: check for existance)],
-+    [
-+        if test x"$withval" = "xyes"; then
-+           AC_DEFINE(HAVE_DEV_PTS_AND_PTC)
-+        fi
-+    ],
-+    [
-+        # Check for ptc device
-+        AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
-+    ]
-+)
- 
- dnl Checks for header files.
- # AC_HEADER_DIRENT
diff --git a/packages/stunnel/stunnel_4.05.bb b/packages/stunnel/stunnel_4.05.bb
deleted file mode 100644
index 5f61b1c125..0000000000
--- a/packages/stunnel/stunnel_4.05.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require stunnel.inc
-
-PR = "r1"
-SRC_URI = "ftp://stunnel.mirt.net/stunnel/OBSOLETE/stunnel-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://automake.patch;patch=1 \
-	   file://init \
-	   file://stunnel.conf"
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index dccdd13bdf..f9d3f7bfc7 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Proper tools for busybox haters"
-PR = "r2"
+DESCRIPTION = "Full versions of tools provided by busybox"
+PR = "r4"
 
 PACKAGE_ARCH = "all"
 ALLOW_EMPTY_${PN} = "1"
@@ -12,6 +12,7 @@ RDEPENDS = "\
 	    sed \
 	    wget \
 	    patch \
+            tar \
 	    diffutils \
             less \
             vim \
@@ -20,4 +21,8 @@ RDEPENDS = "\
             module-init-tools \
 	    "
 
-
+#
+# binutils-symlinks provide ar in a way which conflict with busybox - #1465 for more info
+#
+# busybox tar does not understand '--no-same-owner' option which bitbake use
+#
diff --git a/packages/tasks/task-self-hosting.bb b/packages/tasks/task-self-hosting.bb
new file mode 100644
index 0000000000..566e0956a0
--- /dev/null
+++ b/packages/tasks/task-self-hosting.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "All tools needed for OpenEmbedded build"
+SECTION = "devel"
+LICENSE = "MIT"
+RDEPENDS = "cpp gcc-symlinks binutils-symlinks \
+            perl perl-modules bitbake bash \
+			task-proper-tools glibc-utils \
+			linux-libc-headers-dev glibc-dev \
+			texinfo make cvs subversion monotone-6"
+
+#
+# quilt-native REQ bash and perl/perl-modules
+# binutils REQ texinfo
+#
+# bitbake will fetch all needed python modules
+#
+# toolchain: 
+# - gcc-symlinks will fetch gcc
+# - binutils-symlinks will fetch binutils
+# - glibc-utils REQ cpp
+# 
+# problems:
+# - binutils-symlinks conflict with busybox
+# - glibc-dev conflict with libc-linux-headers-dev
+# - perl is so granulated that it is probably impossible 
+#   to find out which packages are needed
+#
+
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "all"
diff --git a/packages/kismet/kismet-2004-04-R1/.mtn2git_empty b/packages/texinfo/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/.mtn2git_empty
+++ b/packages/texinfo/.mtn2git_empty
diff --git a/packages/texinfo/texinfo_4.8a.bb b/packages/texinfo/texinfo_4.8a.bb
new file mode 100644
index 0000000000..7386226408
--- /dev/null
+++ b/packages/texinfo/texinfo_4.8a.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Documentation system for on-line information and printed output"
+HOMEPAGE = "http://www.gnu.org/software/texinfo/"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.bz2"
+
+inherit autotools gettext
+
+S = "${WORKDIR}/texinfo-4.8/"
diff --git a/packages/u2nl/files/buildsystem.patch b/packages/u2nl/files/buildsystem.patch
index 2877a01729..9de58fa435 100644
--- a/packages/u2nl/files/buildsystem.patch
+++ b/packages/u2nl/files/buildsystem.patch
@@ -1,8 +1,8 @@
-Index: u2nl-1.1/Makefile
+Index: u2nl-1.3/Makefile
 ===================================================================
---- u2nl-1.1.orig/Makefile	2005-03-06 16:32:23.000000000 -0500
-+++ u2nl-1.1/Makefile	2005-03-11 02:38:00.454572600 -0500
-@@ -1,10 +1,25 @@
+--- u2nl-1.3.orig/Makefile	2005-01-03 19:31:20.000000000 +0100
++++ u2nl-1.3/Makefile	2006-12-14 12:38:15.052227000 +0100
+@@ -1,5 +1,25 @@
 +CC      = gcc
 +CFLAGS  = -Wall -g
 +LDFLAGS =
@@ -17,18 +17,16 @@ Index: u2nl-1.1/Makefile
  all: u2nl
  
  u2nl: u2nl.c
--	gcc $(CFLAGS) -Wall -g u2nl.c -o u2nl
+-	gcc -Wall -g u2nl.c -o u2nl
 -	
 +	$(CC) $(CFLAGS) $(LDFLAGS) u2nl.c -o u2nl
 +
- install:
--	cp u2nl /usr/local/bin
++install:
 +	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 +	$(INSTALL_BIN) u2nl $(DESTDIR)$(bindir)/u2nl
 +
 +uninstall:
 +	-rm -f $(DESTDIR)$(bindir)/u2nl
- 
- clean:
--	rm -fR u2nl
++
++clean:
 +	-rm -fR u2nl
diff --git a/packages/u2nl/u2nl_1.1.bb b/packages/u2nl/u2nl_1.3.bb
index 7cfa7b75ba..7cfa7b75ba 100644
--- a/packages/u2nl/u2nl_1.1.bb
+++ b/packages/u2nl/u2nl_1.3.bb
diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb
index 2b29674e7a..ca6baece4c 100644
--- a/packages/uboot/u-boot_1.1.4.bb
+++ b/packages/uboot/u-boot_1.1.4.bb
@@ -26,7 +26,7 @@ SRC_URI_append_gumstix = "\
 SRC_URI_append_amsdelta = "\
 	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1"
 
-SRC_URI_append_dht-walnut= "\ 
+SRC_URI_append_dht-walnut= "\
         file://u-boot-dht-walnut-df2.patch;patch=1"
 
 
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index ef9c40d463..568f8d46ee 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -21,9 +21,10 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-#as stated above, uclibc needs real kernel-headers
-#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
-KERNEL_SOURCE = "${STAGING_KERNEL_DIR}"
+# This is the correct KERNEL_SOURCE location, if the uClibc
+# fix_includes.sh script is run (see nokernelheader.patch below)
+# this must be correct.
+KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 
 SRC_URI += "svn://uclibc.org/trunk;module=uClibc"
 
diff --git a/packages/kismet/kismet-2004-04-R1/mtx-1/.mtn2git_empty b/packages/unrar/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/mtx-1/.mtn2git_empty
+++ b/packages/unrar/.mtn2git_empty
diff --git a/packages/unrar/unrar-native_3.4.3.bb b/packages/unrar/unrar-native_3.4.3.bb
new file mode 100644
index 0000000000..4b87691e89
--- /dev/null
+++ b/packages/unrar/unrar-native_3.4.3.bb
@@ -0,0 +1,14 @@
+require unrar.inc
+inherit native
+
+do_stage() {
+    install unrar ${STAGING_BINDIR}
+}
+
+do_package() {
+    :
+}
+
+do_install() {
+    :
+}
diff --git a/packages/unrar/unrar.inc b/packages/unrar/unrar.inc
new file mode 100644
index 0000000000..4887ac9fb2
--- /dev/null
+++ b/packages/unrar/unrar.inc
@@ -0,0 +1,7 @@
+SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz"
+S = "${WORKDIR}/unrar"
+
+do_compile() {
+    oe_runmake -f makefile.unix
+}
+
diff --git a/packages/unrar/unrar_3.4.3.bb b/packages/unrar/unrar_3.4.3.bb
new file mode 100644
index 0000000000..39d81990e2
--- /dev/null
+++ b/packages/unrar/unrar_3.4.3.bb
@@ -0,0 +1,6 @@
+require unrar.inc
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 unrar ${D}${bindir}
+}
diff --git a/packages/kismet/kismet-2004-04-R1/mtx-2/.mtn2git_empty b/packages/wireshark/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/mtx-2/.mtn2git_empty
+++ b/packages/wireshark/.mtn2git_empty
diff --git a/packages/kismet/kismet-2005-01-R1/.mtn2git_empty b/packages/wireshark/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2005-01-R1/.mtn2git_empty
+++ b/packages/wireshark/files/.mtn2git_empty
diff --git a/packages/wireshark/files/no-host-includes.patch b/packages/wireshark/files/no-host-includes.patch
new file mode 100644
index 0000000000..4a9493d607
--- /dev/null
+++ b/packages/wireshark/files/no-host-includes.patch
@@ -0,0 +1,546 @@
+Index: wireshark-0.99.4/plugins/acn/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/acn/Makefile.am	2006-12-14 14:47:13.322227000 +0100
++++ wireshark-0.99.4/plugins/acn/Makefile.am	2006-12-14 14:47:38.862227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/acn/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/acn/Makefile.in	2006-12-14 14:47:13.352227000 +0100
++++ wireshark-0.99.4/plugins/acn/Makefile.in	2006-12-14 14:48:09.612227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = acn
+Index: wireshark-0.99.4/plugins/agentx/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/agentx/Makefile.am	2006-12-14 14:47:13.372227000 +0100
++++ wireshark-0.99.4/plugins/agentx/Makefile.am	2006-12-14 14:48:30.252227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/agentx/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/agentx/Makefile.in	2006-12-14 14:47:13.402227000 +0100
++++ wireshark-0.99.4/plugins/agentx/Makefile.in	2006-12-14 14:48:37.612227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = agentx
+Index: wireshark-0.99.4/plugins/artnet/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/artnet/Makefile.am	2006-12-14 14:47:13.422227000 +0100
++++ wireshark-0.99.4/plugins/artnet/Makefile.am	2006-12-14 14:48:42.422227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/artnet/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/artnet/Makefile.in	2006-12-14 14:47:13.452227000 +0100
++++ wireshark-0.99.4/plugins/artnet/Makefile.in	2006-12-14 14:48:46.142227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = artnet
+Index: wireshark-0.99.4/plugins/asn1/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/asn1/Makefile.am	2006-12-14 14:47:13.482227000 +0100
++++ wireshark-0.99.4/plugins/asn1/Makefile.am	2006-12-14 14:48:50.352227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/asn1/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/asn1/Makefile.in	2006-12-14 14:47:13.502227000 +0100
++++ wireshark-0.99.4/plugins/asn1/Makefile.in	2006-12-14 14:48:54.772227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = asn1
+Index: wireshark-0.99.4/plugins/ciscosm/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/ciscosm/Makefile.am	2006-12-14 14:47:13.532227000 +0100
++++ wireshark-0.99.4/plugins/ciscosm/Makefile.am	2006-12-14 14:49:01.482227000 +0100
+@@ -23,7 +23,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/ciscosm/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/ciscosm/Makefile.in	2006-12-14 14:47:13.552227000 +0100
++++ wireshark-0.99.4/plugins/ciscosm/Makefile.in	2006-12-14 14:49:18.302227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = ciscosm
+Index: wireshark-0.99.4/plugins/docsis/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/docsis/Makefile.am	2006-12-14 14:47:13.582227000 +0100
++++ wireshark-0.99.4/plugins/docsis/Makefile.am	2006-12-14 14:49:18.302227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/docsis/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/docsis/Makefile.in	2006-12-14 14:47:13.602227000 +0100
++++ wireshark-0.99.4/plugins/docsis/Makefile.in	2006-12-14 14:49:18.312227000 +0100
+@@ -380,7 +380,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = docsis
+Index: wireshark-0.99.4/plugins/enttec/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/enttec/Makefile.am	2006-12-14 14:47:13.632227000 +0100
++++ wireshark-0.99.4/plugins/enttec/Makefile.am	2006-12-14 14:49:18.322227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/enttec/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/enttec/Makefile.in	2006-12-14 14:47:13.662227000 +0100
++++ wireshark-0.99.4/plugins/enttec/Makefile.in	2006-12-14 14:49:18.332227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = enttec
+Index: wireshark-0.99.4/plugins/gryphon/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/gryphon/Makefile.am	2006-12-14 14:47:13.712227000 +0100
++++ wireshark-0.99.4/plugins/gryphon/Makefile.am	2006-12-14 14:49:18.342227000 +0100
+@@ -24,7 +24,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/gryphon/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/gryphon/Makefile.in	2006-12-14 14:47:13.732227000 +0100
++++ wireshark-0.99.4/plugins/gryphon/Makefile.in	2006-12-14 14:49:18.342227000 +0100
+@@ -373,7 +373,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = gryphon
+Index: wireshark-0.99.4/plugins/h223/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/h223/Makefile.am	2006-12-14 14:47:13.762227000 +0100
++++ wireshark-0.99.4/plugins/h223/Makefile.am	2006-12-14 14:49:18.352227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/h223/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/h223/Makefile.in	2006-12-14 14:47:13.792227000 +0100
++++ wireshark-0.99.4/plugins/h223/Makefile.in	2006-12-14 14:49:18.362227000 +0100
+@@ -373,7 +373,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = h223
+Index: wireshark-0.99.4/plugins/irda/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/irda/Makefile.am	2006-12-14 14:47:13.812227000 +0100
++++ wireshark-0.99.4/plugins/irda/Makefile.am	2006-12-14 14:49:18.362227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/irda/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/irda/Makefile.in	2006-12-14 14:47:13.842227000 +0100
++++ wireshark-0.99.4/plugins/irda/Makefile.in	2006-12-14 14:49:18.372227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = irda
+Index: wireshark-0.99.4/plugins/lwres/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/lwres/Makefile.am	2006-12-14 14:47:13.862227000 +0100
++++ wireshark-0.99.4/plugins/lwres/Makefile.am	2006-12-14 14:49:18.382227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/lwres/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/lwres/Makefile.in	2006-12-14 14:47:13.892227000 +0100
++++ wireshark-0.99.4/plugins/lwres/Makefile.in	2006-12-14 14:49:19.432227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = lwres
+Index: wireshark-0.99.4/plugins/megaco/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/megaco/Makefile.am	2006-12-14 14:47:13.942227000 +0100
++++ wireshark-0.99.4/plugins/megaco/Makefile.am	2006-12-14 14:49:19.442227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/megaco/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/megaco/Makefile.in	2006-12-14 14:47:13.972227000 +0100
++++ wireshark-0.99.4/plugins/megaco/Makefile.in	2006-12-14 14:49:19.452227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = megaco
+Index: wireshark-0.99.4/plugins/mgcp/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/mgcp/Makefile.am	2006-12-14 14:47:13.992227000 +0100
++++ wireshark-0.99.4/plugins/mgcp/Makefile.am	2006-12-14 14:49:19.462227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/mgcp/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/mgcp/Makefile.in	2006-12-14 14:47:14.022227000 +0100
++++ wireshark-0.99.4/plugins/mgcp/Makefile.in	2006-12-14 14:49:19.462227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = mgcp
+Index: wireshark-0.99.4/plugins/opsi/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/opsi/Makefile.am	2006-12-14 14:47:14.042227000 +0100
++++ wireshark-0.99.4/plugins/opsi/Makefile.am	2006-12-14 14:49:19.472227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/opsi/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/opsi/Makefile.in	2006-12-14 14:47:14.072227000 +0100
++++ wireshark-0.99.4/plugins/opsi/Makefile.in	2006-12-14 14:49:19.482227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = opsi
+Index: wireshark-0.99.4/plugins/pcli/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/pcli/Makefile.am	2006-12-14 14:47:14.102227000 +0100
++++ wireshark-0.99.4/plugins/pcli/Makefile.am	2006-12-14 14:49:19.492227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/pcli/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/pcli/Makefile.in	2006-12-14 14:47:14.122227000 +0100
++++ wireshark-0.99.4/plugins/pcli/Makefile.in	2006-12-14 14:49:19.492227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = pcli
+Index: wireshark-0.99.4/plugins/profinet/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/profinet/Makefile.am	2006-12-14 14:47:14.152227000 +0100
++++ wireshark-0.99.4/plugins/profinet/Makefile.am	2006-12-14 14:49:19.502227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/profinet/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/profinet/Makefile.in	2006-12-14 14:47:14.182227000 +0100
++++ wireshark-0.99.4/plugins/profinet/Makefile.in	2006-12-14 14:49:19.512227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = profinet
+Index: wireshark-0.99.4/plugins/rlm/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rlm/Makefile.am	2006-12-14 14:47:14.202227000 +0100
++++ wireshark-0.99.4/plugins/rlm/Makefile.am	2006-12-14 14:49:19.522227000 +0100
+@@ -23,7 +23,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/rlm/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rlm/Makefile.in	2006-12-14 14:47:14.232227000 +0100
++++ wireshark-0.99.4/plugins/rlm/Makefile.in	2006-12-14 14:49:19.542227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = rlm
+Index: wireshark-0.99.4/plugins/rtnet/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rtnet/Makefile.am	2006-12-14 14:47:14.252227000 +0100
++++ wireshark-0.99.4/plugins/rtnet/Makefile.am	2006-12-14 14:49:19.562227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/rtnet/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rtnet/Makefile.in	2006-12-14 14:47:14.282227000 +0100
++++ wireshark-0.99.4/plugins/rtnet/Makefile.in	2006-12-14 14:49:19.572227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = rtnet
+Index: wireshark-0.99.4/plugins/rudp/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rudp/Makefile.am	2006-12-14 14:47:14.312227000 +0100
++++ wireshark-0.99.4/plugins/rudp/Makefile.am	2006-12-14 14:49:19.582227000 +0100
+@@ -23,7 +23,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/rudp/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/rudp/Makefile.in	2006-12-14 14:47:14.342227000 +0100
++++ wireshark-0.99.4/plugins/rudp/Makefile.in	2006-12-14 14:49:20.202227000 +0100
+@@ -371,7 +371,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = rudp
+Index: wireshark-0.99.4/plugins/sbus/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/sbus/Makefile.am	2006-12-14 14:47:14.362227000 +0100
++++ wireshark-0.99.4/plugins/sbus/Makefile.am	2006-12-14 14:49:20.212227000 +0100
+@@ -21,7 +21,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/sbus/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/sbus/Makefile.in	2006-12-14 14:47:14.392227000 +0100
++++ wireshark-0.99.4/plugins/sbus/Makefile.in	2006-12-14 14:49:20.222227000 +0100
+@@ -369,7 +369,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = sbus
+Index: wireshark-0.99.4/plugins/v5ua/Makefile.am
+===================================================================
+--- wireshark-0.99.4.orig/plugins/v5ua/Makefile.am	2006-12-14 14:47:14.442227000 +0100
++++ wireshark-0.99.4/plugins/v5ua/Makefile.am	2006-12-14 14:49:20.232227000 +0100
+@@ -22,7 +22,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #
+ 
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ include Makefile.common
+ 
+Index: wireshark-0.99.4/plugins/v5ua/Makefile.in
+===================================================================
+--- wireshark-0.99.4.orig/plugins/v5ua/Makefile.in	2006-12-14 14:47:14.472227000 +0100
++++ wireshark-0.99.4/plugins/v5ua/Makefile.in	2006-12-14 14:49:20.232227000 +0100
+@@ -370,7 +370,7 @@
+ wireshark_bin = @wireshark_bin@
+ wireshark_man = @wireshark_man@
+ wiresharkfilter_man = @wiresharkfilter_man@
+-INCLUDES = -I$(top_srcdir) -I$(includedir)
++INCLUDES = -I$(top_srcdir)
+ 
+ # the name of the plugin
+ PLUGIN_NAME = v5ua
diff --git a/packages/ethereal/files/use-our-lemon.patch b/packages/wireshark/files/use-our-lemon.patch
index c2850807db..c2850807db 100644
--- a/packages/ethereal/files/use-our-lemon.patch
+++ b/packages/wireshark/files/use-our-lemon.patch
diff --git a/packages/wireshark/wireshark_0.99.4.bb b/packages/wireshark/wireshark_0.99.4.bb
new file mode 100644
index 0000000000..5b1fa72a1b
--- /dev/null
+++ b/packages/wireshark/wireshark_0.99.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
+HOMEPAGE = "http://www.ethereal.com"
+SECTION = "x11/network"
+LICENSE = "GPL"
+DEPENDS = "perl-native gtk+ gnutls libpcap pcre expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+           file://use-our-lemon.patch;patch=1 \
+	   file://no-host-includes.patch;patch=1"
+
+inherit autotools
+
+do_compile_prepend() {
+	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+}
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 4e39aa6ace..6a8e43ec9c 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 do_compile() {
 	(
 	 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-	 oe_runmake -C src/util 'X11_CFLAGS=' '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
+	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys	
 	) || exit 1
 		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
diff --git a/packages/xserver-common/xserver-common_1.13.bb b/packages/xserver-common/xserver-common_1.13.bb
new file mode 100644
index 0000000000..d14cad725b
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.13.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/removal.txt b/removal.txt
index 79af0cc809..f16f7c79d3 100644
--- a/removal.txt
+++ b/removal.txt
@@ -3,6 +3,8 @@ Packages to be removed from OpenEmbedded if no one will fix them.
 Dropping stuff from metadata is not best way so this file will be filled
 with informations about which parts of metadata will be removed.
 
+Please sort by removal date
+
 Package Name:   recipe, directory or subsystem name
 Removal Date:   YYYY-MM-DD
 Maintainer:     Surname Name + e-mail
@@ -12,45 +14,21 @@ Proposed by:    person which want entry to be removed
 -----------------------------------------------------------------------------
 
 Package Name:   Maemo
-Removal Date:   2006-12-12
+Removal Date:   2006-12-15
 Maintainer:     none
 Reason:         Unfetchable, obsoleted by IT2006 release.
 Proposed by:    Marcin 'Hrw' Juszkiewicz
 
 Package Name:   task-bootstrap*
-Removal Date:   2006-12-12
+Removal Date:   2006-12-22
 Maintainer:     None
 Reason:         Obsoleted by task-base
 Proposed by:    Koen Kooi
 
-Package Name:   bluez*2.*
-Removal Date:   2007-01-15
+Package Name:   gst* 0.8.x
+Removal Date:   2006-12-29
 Maintainer:     None
-Reason:         Obsolete by, and conflicts with bluez 3.7               
+Reason:         Conflicting namespace with gstreamer 0.10 at build time
 Proposed by:    Koen Kooi
-Will fix:       Paul Sokolovsky
-Reason:         Still known to be used by OPIE, so extra time needed to upgrade it.
 
-Package Name:   mono
-Removal Date:   2006-12-12
-Maintainer:     None
-Reason:         Obsolete version - 1.2 is current, 1.0 is not fetchable
-Proposed by:    Marcin 'Hrw' Juszkiewicz
- 
-Package Name:   ipac-ng
-Removal Date:   2006-12-12
-Maintainer:     None
-Reason:         Depends on libgd-perl which is not in metada
-Proposed by:    Marcin 'Hrw' Juszkiewicz
- 
-Package Name:   nsqld
-Removal Date:   2006-12-12
-Maintainer:     None
-Reason:	        Never used
-Proposed by:    Florian Boor
 
-Package Name:   gpe-mileage
-Removal Date:   2006-12-12
-Maintainer:     None
-Reason:         Unfinished, no development progress
-Proposed by:    Florian Boor
diff --git a/site/powerpc-linux b/site/powerpc-linux
index 6e749d4640..d3e079a4ed 100644
--- a/site/powerpc-linux
+++ b/site/powerpc-linux
@@ -267,3 +267,49 @@ ac_cv_type_int=${ac_cv_type_int=yes}
 ac_cv_type_uintptr_t=${ac_cv_type_uintptr_t=yes}
 liberty_cv_uint64=${liberty_cv_uint64=uint64_t}
 
+#samba
+ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
+fu_cv_sys_stat_statvfs64=${fu_cv_sys_stat_statvfs64=yes}
+samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no}
+samba_cv_HAVE_BROKEN_GETGROUPS=${samba_cv_HAVE_BROKEN_GETGROUPS=no}
+samba_cv_HAVE_BROKEN_READDIR=${samba_cv_HAVE_BROKEN_READDIR=yes}
+samba_cv_HAVE_BROKEN_READDIR_NAME=${samba_cv_HAVE_BROKEN_READDIR_NAME=no}
+samba_cv_HAVE_C99_VSNPRINTF=${samba_cv_HAVE_C99_VSNPRINTF=yes}
+samba_cv_HAVE_DEV64_T=${samba_cv_HAVE_DEV64_T=no}
+samba_cv_HAVE_DEVICE_MAJOR_FN=${samba_cv_HAVE_DEVICE_MAJOR_FN=yes}
+samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes}
+samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
+samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
+samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
+samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
+samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
+samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
+samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
+samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
+samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
+samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
+samba_cv_HAVE_MAKEDEV=${samba_cv_HAVE_MAKEDEV=yes}
+samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes}
+samba_cv_HAVE_OFF64_T=${samba_cv_HAVE_OFF64_T=no}
+samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes}
+samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes}
+samba_cv_HAVE_SENDFILE=${samba_cv_HAVE_SENDFILE=yes}
+samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
+samba_cv_HAVE_TRUNCATED_SALT=${samba_cv_HAVE_TRUNCATED_SALT=no}
+samba_cv_HAVE_UNSIGNED_CHAR=${samba_cv_HAVE_UNSIGNED_CHAR=yes}
+samba_cv_HAVE_WORKING_AF_LOCAL=${samba_cv_HAVE_WORKING_AF_LOCAL=yes}
+samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
+samba_cv_REALPATH_TAKES_NULL=${samba_cv_REALPATH_TAKES_NULL=yes}
+samba_cv_REPLACE_INET_NTOA=${samba_cv_REPLACE_INET_NTOA=no}
+samba_cv_REPLACE_READDIR=${samba_cv_REPLACE_READDIR=no}
+samba_cv_SIZEOF_DEV_T=${samba_cv_SIZEOF_DEV_T=yes}
+samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
+samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
+samba_cv_STAT_STATVFS64=${samba_cv_STAT_STATVFS64=yes}
+samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
+samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
+samba_cv_have_longlong=${samba_cv_have_longlong=yes}
+samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
+samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
diff --git a/site/powerpc-linux-uclibc b/site/powerpc-linux-uclibc
new file mode 100644
index 0000000000..aa9fd6bba3
--- /dev/null
+++ b/site/powerpc-linux-uclibc
@@ -0,0 +1,200 @@
+ac_cv_func_getpgrp_void=yes
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_setgrent_void=yes
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_malloc_works=yes
+ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_setvbuf_reversed=no
+ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
+ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
+ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
+ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4}
+ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
+ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
+ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
+ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
+ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
+
+ac_cv_sys_restartable_syscalls=yes
+ac_cv_type___int64=${ac_cv_type___int64=no}
+ac_cv_type_size_t=${ac_cv_type_size_t=yes}
+ac_cv_type_void_p=${ac_cv_type_void_p=yes}
+ac_cv_uchar=${ac_cv_uchar=no}
+ac_cv_uint=${ac_cv_uint=yes}
+ac_cv_ulong=${ac_cv_ulong=yes}
+ac_cv_ushort=${ac_cv_ushort=yes}
+
+mr_cv_target_elf=${mr_cv_target_elf=yes}
+
+ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
+cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes}
+
+
+# apache
+ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
+apr_cv_process_shared_works=${apr_cv_process_shared_works=no}
+ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
+
+ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}
+ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}
+ac_cv_sctp=${ac_cv_sctp=no}
+
+# ssh
+ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
+ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
+ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
+ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
+ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes}
+ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes}
+
+# coreutils
+utils_cv_sys_open_max=${utils_cv_sys_open_max=1019}
+
+# libpcap
+ac_cv_linux_vers=${ac_cv_linux_vers=2}
+
+# nano
+ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no}
+nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
+
+# libnet 
+ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big}
+
+
+
+# socat
+ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13}
+sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes}
+
+# links
+ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes}
+
+# sleepycat db
+db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
+db_cv_sprintf_count=${db_cv_sprintf_count=yes}
+db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
+db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
+db_cv_path_cp=${db_cv_path_cp=/bin/cp}
+db_cv_path_ln=${db_cv_path_ln=/bin/ln}
+db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
+db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
+db_cv_path_rm=${db_cv_path_rm=/bin/rm}
+db_cv_path_sh=${db_cv_path_sh=/bin/sh}
+db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
+db_cv_align_t=${db_cv_align_t='unsigned long long'}
+db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
+db_cv_mutex=${db_cv_mutex=no}
+db_cv_posixmutexes=${db_cv_posixmutexes=no}
+db_cv_uimutexes=${db_cv_uimutexes=no}
+
+# php
+ac_cv_pread=${ac_cv_pread=no}
+ac_cv_pwrite=${ac_cv_pwrite=no}
+php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes}
+
+
+# ettercap
+ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes}
+
+# libesmtp
+acx_working_snprintf=${acx_working_snprintf=yes}
+
+# D-BUS
+ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
+
+# glib 2.0
+glib_cv_long_long_format=${glib_cv_long_long_format=ll}
+glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
+glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8}
+glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
+glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4}
+glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
+glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes}
+
+glib_cv_strlcpy=${glib_cv_strlcpy=no}
+
+# httppc
+ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
+
+# lftp
+ac_cv_need_trio=${ac_cv_need_trio=no}
+lftp_cv_va_copy=${lftp_cv_va_copy=no}
+lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes}
+lftp_cv___va_copy=${lftp_cv___va_copy=yes}
+
+# edb
+db_cv_spinlocks=${db_cv_spinlocks=no}
+
+# fget
+compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
+compat_cv_func_basename_works=${compat_cv_func_basename_works=no}
+compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no}
+
+# slrn
+slrn_cv___va_copy=${slrn_cv___va_copy=yes}
+slrn_cv_va_copy=${slrn_cv_va_copy=no}
+slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
+ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
+ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
+ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
+
+# startup-notification
+lf_cv_sane_realloc=yes
+
+# libidl
+libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
+
+# ORBit2
+ac_cv_alignof_CORBA_boolean=1
+ac_cv_alignof_CORBA_char=1
+ac_cv_alignof_CORBA_double=4
+ac_cv_alignof_CORBA_float=4
+ac_cv_alignof_CORBA_long=4
+ac_cv_alignof_CORBA_long_double=4
+ac_cv_alignof_CORBA_long_long=4
+ac_cv_alignof_CORBA_octet=1
+ac_cv_alignof_CORBA_pointer=4
+ac_cv_alignof_CORBA_short=2
+ac_cv_alignof_CORBA_struct=4
+ac_cv_alignof_CORBA_wchar=2
+ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
+
+# cvs
+cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
+
+# bash
+ac_cv_c_long_double=${ac_cv_c_long_double=yes}
+bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
+bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing}
+bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
+bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no}
+bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
+bash_cv_sys_siglist=${bash_cv_sys_siglist=yes}
+bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
+bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
+bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t}
+bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
+bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
+bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
+bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
+bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
+bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
+bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
+bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
+ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes}
+
+# openssh
+ac_cv_have_broken_dirname=${ac_cv_have_broken_dirname='yes'}
+ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent='no'}
+ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf='no'}
+ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug='yes'}
+ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr='no'}
+ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr='yes'}
+
+# vim
+ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}