Merge remote-tracking branch 'gerrit/master' into albacore_uprev

These changes were merged:
* gerrit/master:
  Cleanup of recipes for CESdemo

Change-Id: I01666aad5a724cf5b467ed25da30c7fcece20ec6
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

1 files changed, 3 insertions, 6 deletions

diff --git a/README.md b/README.md
index eab32ca95..dd08bc21d 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ URI: git://git.yoctoproject.org/poky
 > revision: df87cb27efeaea1455f20692f9f1397c6fcab254
 
 URI: git://git.openembedded.org/meta-openembedded
-> layer:    meta-oe
+> layer:    meta-oe, meta-multimedia, meta-ruby
 > branch:   dizzy
 > revision: 9efaed99125b1c4324663d9a1b2d3319c74e7278
 
@@ -151,13 +151,10 @@ You can build a QEMU image using the following steps:
 2. Build the full image of AGL Demo Platform and applications
         $ bitbake agl-demo-platform
 
-  2a. Specifically If you are building the CES2016 demos you will want to add the following to your "conf/local.conf" file to install the demo code in the image:
-IMAGE_INSTALL_append = " CES2016-demo"
-
-  2b. If you want to run QEMU directly as VM in Virtual Box or your other favorite VM software then add this line to your "conf/local.conf" file. 
+  2a. If you want to run QEMU directly as VM in Virtual Box or your other favorite VM software then add this line to your "conf/local.conf" file. 
 IMAGE_FSTYPES += "vmdk"
 
-  2c. The Weston IVI-Shell always gets built ; it will not be started, however, unless you specify the following in your "conf/local.conf" file :
+  2b. The Weston IVI-Shell always gets built ; it will not be started, however, unless you specify the following in your "conf/local.conf" file :
 
 IMAGE_INSTALL_append = " \
     weston-ivi-shell-config \