merge of 6dc5369b32237cf596f3cd1b746d8fc2326bf8bd

     and 873692217328c8db613557cc3eaef48a2a6860fb

diff --cc packages/e17/e17-gpe-menu-convert_0.2.bb
index d79a501,fd55d34..88eefa7
--- 1/packages/e17/e17-gpe-menu-convert_0.2.bb
--- 2/packages/e17/e17-gpe-menu-convert_0.2.bb
+++ b/packages/e17/e17-gpe-menu-convert_0.2.bb
@@@ -15,4 -16,4 +15,4 @@@ do_install() 
  
  #pkg_postinst() {
  #     /usr/bin/e17-gpe-menu-convert.sh
--#}
++#}

diff --cc packages/efl/edb_1.0.5.005.bb
index 6f771fb,5550538..a152530
--- 1/packages/efl/edb_1.0.5.005.bb
--- 2/packages/efl/edb_1.0.5.005.bb
+++ b/packages/efl/edb_1.0.5.005.bb
@@@ -9,5 -16,3 +9,5 @@@ inherit ef
  EXTRA_OECONF += "--disable-gtk"
  
  libdirectory = "src"
- FILES_${PN}-examples = ""
 +
++FILES_${PN}-examples = ""

diff --cc packages/efl/embryo_0.9.1.023.bb
index 65345ef,603a0c8..0009c0a
--- 1/packages/efl/embryo_0.9.1.023.bb
--- 2/packages/efl/embryo_0.9.1.023.bb
+++ b/packages/efl/embryo_0.9.1.023.bb
@@@ -4,8 -4,12 +4,8 @@@ CompuPhase's Small language that was in
  Embryo allows scripting capabilities in places that otherwise wouldn't support \
  basic programming structures such as in Edje EDCs."
  LICENSE = "MIT"
 -PR = "r3"
 -
 -## package.bbclass kills packages when there are duplicates, this means
 -##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
 -##  packages take precedence over -utils
 -#PACKAGES = "embryo-utils"
 -#FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
 +PR = "r4"
  
  inherit efl
- FILES_${PN}-examples = "${datadir}/${PN}/examples"
 +
++FILES_${PN}-examples = "${datadir}/${PN}/examples"