Merge commit 'origin/opendreambox-1.6' into test

Conflicts:

	recipes/base-files/base-files_3.0.14.bb
	-> fix revision

diff --cc recipes/base-files/base-files_3.0.14.bb
index 4650862,620bd39..c3c1515
mode 100755,100644..100755
--- 1/recipes/base-files/base-files_3.0.14.bb
--- 2/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@@ -1,8 -1,7 +1,9 @@@
  DESCRIPTION = "Miscellaneous files for the base system."
  SECTION = "base"
  PRIORITY = "required"
- PR = "r90"
+ PR = "r91"
 +PR_vuplus = "r58"
++
  LICENSE = "GPL"
  
  SRC_URI = " \

diff --cc recipes/libdreamdvd/libdreamdvd.bb
index fd5a851,968a38a..7700876
mode 100755,100644..100755
--- 1/recipes/libdreamdvd/libdreamdvd.bb
--- 2/recipes/libdreamdvd/libdreamdvd.bb
+++ b/recipes/libdreamdvd/libdreamdvd.bb