merge of 755dbf7499934a2404de279fb00043830c15add1

     and c110ccecd8770f6c3ae49eead02de2c93ffac02b

diff --cc packages/linux/ixp4xx-kernel_2.6.15.2.bb
index 90bc655,6881708..1016329
--- 1/packages/linux/ixp4xx-kernel_2.6.15.2.bb
--- 2/packages/linux/ixp4xx-kernel_2.6.15.2.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.2.bb
@@@ -8,7 -8,7 +8,7 @@@ PR_CONFIG = "1
  # Increment the number below (i.e. the digits after PR) when
  # making changes within this file or for changes to the patches
  # applied to the kernel.
- PR = "r1.${PR_CONFIG}"
 -PR = "r0.${PR_CONFIG}"
++PR = "r2.${PR_CONFIG}"
  
  include ixp4xx-kernel.inc
  

diff --cc packages/slugos-init/slugos-init_0.10.bb
index 561f593,6a31fca..7c4c21f
--- 1/packages/slugos-init/slugos-init_0.10.bb
--- 2/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@@ -4,7 -4,7 +4,7 @@@ PRIORITY = "required
  LICENSE = "GPL"
  DEPENDS = "base-files devio"
  RDEPENDS = "busybox devio"
- PR = "r53"
 -PR = "r52"
++PR = "r54"
  
  SRC_URI = "file://boot/flash \
           file://boot/disk \