Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

diff --combined meta-bsp/vusolo2/conf/machine/vusolo2.conf
index fa14a48,21a4949..806c4fa
--- 1/meta-bsp/vusolo2/conf/machine/vusolo2.conf
--- 2/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@@ -14,7 -14,6 +14,7 @@@ VUPLUS_FEATURES += "dlna
  VUPLUS_FEATURES += "3gmodem"
  VUPLUS_FEATURES += "webif"
  VUPLUS_FEATURES += "autoshutdown"
 +VUPLUS_FEATURES += "transcoding"
  
  IMAGE_UNPACK_PATH = "vuplus/solo2"
  MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
@@@ -23,5 -22,6 +23,6 @@@ require conf/machine/include/vuplus-ubi
  require conf/machine/include/vuplus-mips32el.inc
  
  VUPLUS_KERNEL_VERSION = "3.3.6"
- LINUXLIBCVERSION = "2.6.31"
+ #LINUXLIBCVERSION = "2.6.31"
+ LINUXLIBCVERSION = "3.3"