Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/obi/opendr...

Conflicts:

	packages/base-files/base-files_3.0.14.bb

diff --cc packages/base-files/base-files_3.0.14.bb
index 1a15dc3,fc144b8..7828fd6
--- 1/packages/base-files/base-files_3.0.14.bb
--- 2/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@@ -1,9 -1,7 +1,8 @@@
  DESCRIPTION = "Miscellaneous files for the base system."
  SECTION = "base"
  PRIORITY = "required"
- PR = "r55"
- PR_dm7025 = "r56"
+ PR = "r56"
 +
  LICENSE = "GPL"
  
  SRC_URI = " \