Merge remote-tracking branch 'gerrit/master' into albacore_uprev 07/5207/1
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>
Tue, 22 Dec 2015 20:35:17 +0000 (21:35 +0100)
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>
Tue, 22 Dec 2015 20:35:48 +0000 (21:35 +0100)
These changes were merged:
* gerrit/master:
  Cleanup of recipes for CESdemo

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

Trivial merge