Merge branch 'oem-workaround-force-install-intel-red' of git+ssh://git.launchpad.net/~oem-solutions-engineers/somerville/+git/oem-workaround into oem-workaround-force-install-intel-red

# Conflicts:
#	debian/control
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch oem-workaround-force-install-intel-red
# Your branch and 'origin/oem-workaround-force-install-intel-red' have diverged,
# and have 1 and 1 different commit each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   debian/changelog
#
