Merge branch 'vuplus-1.6k_dev' of /home/shcheong/work/stb/sw/oe_1.6/bm750/openembedde...

Conflicts:
	recipes/vuplus/vuplus-dvb-modules.bb

diff --cc recipes/enigma2/enigma2.bb
Simple merge

diff --cc recipes/tasks/task-vuplus-base.bb
index d982c58,02fb815..0cefae0
--- 1/recipes/tasks/task-vuplus-base.bb
--- 2/recipes/tasks/task-vuplus-base.bb
+++ b/recipes/tasks/task-vuplus-base.bb
@@@ -63,10 -63,9 +63,12 @@@ VUPLUS_BASE_RECOMMENDS = "
  VUPLUS_BASE_RECOMMENDS_append_vuuno = " vuplus-fpga-update"
  VUPLUS_BASE_RECOMMENDS_append_vuultimo = " vuplus-fpga-update"
  
 +#VUPLUS_BASE_RECOMMENDS_append_vuduo2 = " vuplus-manual"
 +VUPLUS_BASE_RECOMMENDS_append_vusolo2 = " vuplus-manual"
 +
  VUPLUS_BASE_OPTIONAL_RECOMMENDS = "\
+   djmount \
+   minidlna \
    gdbserver \
    hddtemp \
    joe \

diff --cc recipes/tasks/task-vuplus-wlan.bb
Simple merge

diff --cc recipes/vuplus/vuplus-dvb-modules.bb
index a17db86,8d4f18c..2122926
--- 1/recipes/vuplus/vuplus-dvb-modules.bb
--- 2/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@@ -9,14 -7,10 +9,14 @@@ KV_vuduo2 = "${@base_contains('PREFERRE
  
  PV = "${KV}"
  
- SRCDATE_bm750 = "20120824"
- SRCDATE_vusolo = "20120824"
- SRCDATE_vuuno = "20120824"
- SRCDATE_vuultimo = "20120824"
 +inherit module
 +
+ SRCDATE_bm750 = "20121025"
+ SRCDATE_vusolo = "20121025"
+ SRCDATE_vuuno = "20121025"
+ SRCDATE_vuultimo = "20121025"
 +SRCDATE_vuduo2 = "20121025"
 +SRCDATE_vusolo2 = "20121030"
  
  MODULES_NAME_bm750 = "procmk\ndvb-bcm7335\nbrcmfb"
  MODULES_NAME_vusolo = "procmk\ndvb-bcm7325\nbrcmfb"