Merge branch 'vuplus-1.6' of 192.168.102.66:/var/ikseong/repo/openembedded into vuplu...

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

diff --cc recipes/enigma2/enigma2.bb
index 08485d4,5a77439..aca17df
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@@ -99,10 -98,11 +99,12 @@@ PV_vuplus = "experimental-git${SRCDATE}
  SRCREV_vuplus = ""
  ####################################################
  
- 
  SRC_URI = "git://git.opendreambox.org/git/enigma2.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 +SRC_URI_append_dm7025 = " file://7025_pvr_device_compatibility.diff;patch=1;pnum=1"
  
+ # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
+ # enigma2_vuplus_mediaplayer_unpause.patch is for work-around of gstreamer bug 
+ 
  
  SRC_URI_bm750 = "git://archive.vuplus.com/git/enigma2.git;protocol=http;branch=${BRANCH};tag=${SRCREV} \
           file://enigma2_vuplus_duo.patch;patch=1;pnum=1 \