Merge commit 'origin/vuplus-1.6' into vuplus-1.6

diff --cc recipes/klibc/klibc_1.5.15.inc
index d9353ea,1355860..8aa572c
--- 1/recipes/klibc/klibc_1.5.15.inc
--- 2/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@@ -6,11 -6,14 +6,16 @@@ SRC_URI += "file://staging.patch;patch=
              file://isystem.patch;patch=1 \
           "
  
 -SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
 +#SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
 +#             ' file://klibc_kexecsyscall.patch;patch=1', d)}"
 +SRC_URI_append = "${@base_conditional('DISTRO', 'vuplus', '', \
                ' file://klibc_kexecsyscall.patch;patch=1', d)}"
  
+ #needed for kernel 2.6.32
+ SRC_URI_append_dm7025 = "file://23-use-AF_INET-directly.patch;patch=1 \
+       file://24-add-relevant-socket-h-definitions.patch;patch=1 \
+ "
+ 
  # we want only the shared programms and the lib so we chose them manually
  do_install() {
          install -d ${D}${base_bindir}