merge of '52aa2df47cf7bc30b6972165f60dd26369dd337c'

     and '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'

57 files changed, 533 insertions, 163 deletions

diff --git a/classes/scons.bbclass b/classes/scons.bbclass
index 534b3bd4c7..6d0a783dc2 100644
--- a/classes/scons.bbclass
+++ b/classes/scons.bbclass
@@ -6,6 +6,7 @@ scons_do_compile() {
 }
 
 scons_do_install() {
+	install -d ${D}${prefix}
         ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \
         oefatal "scons install execution failed."
 }
diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index 6f77f460dc..ae186bd04a 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -4,7 +4,7 @@
 
 # yes, python-sip is actually a build-time dependency, since
 # the recipe installs sip.h
-DEPENDS =+ "sip-native python-sip"
+DEPENDS += "sip-native python-sip"
 
 # default stuff, do not uncomment
 # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index afa2a95e2b..76eacce219 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e
 md5=b67ef657b83ca26249d7b9e9c5e7da69
 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
 
+[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2]
+md5=391f85b4f962269e044ceac2b5235310
+sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
+
 [http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
 md5=3bdf4da35ff576a401483815952f4045
 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 43cadd36a7..aaa503edb9 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.12"
+PREFERRED_VERSION_midori ?= "0.0.13"
 PREFERRED_VERSION_midpath ?= "0.1"
 PREFERRED_VERSION_midpath-alsa ?= "0.1"
 PREFERRED_VERSION_midpath-cldc ?= "0.1"
@@ -1274,6 +1274,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
 PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
 PREFERRED_VERSION_mono-native ?= "1.2.5.1"
 PREFERRED_VERSION_monotone-4 ?= "0.19"
 PREFERRED_VERSION_monotone-5 ?= "0.25.2"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 316fc5a4de..2cc722f013 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -10,31 +10,19 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
@@ -46,21 +34,11 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a65f477296..2a3017afdf 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -62,7 +62,7 @@ SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "3249"
+SRCREV_pn-openmoko-browser2 ?= "3646"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
 SRCREV_pn-openmoko-common ?= "397"
@@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "661"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3522"
-SRCREV_pn-openmoko-feedreader2 ?= "3080"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
@@ -94,6 +94,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-gsm ?= "3256"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
+SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
@@ -121,9 +122,9 @@ SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-webkit-gtk ?= "27222"
-SRCREV_pn-webkit-qt ?= "27222"
-SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-webkit-gtk ?= "28656"
+SRCREV_pn-webkit-qt ?= "28656"
+SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 5f885b1377..79bb97e0de 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -36,6 +36,7 @@ do_report_success() {
 for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
 do
 	BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross"
 	BUILD_TARGETS="minimal-image console-image"
 	do_build
 done
@@ -59,7 +60,7 @@ done
 for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="minimal-image console-image x11-image"
+	BUILD_TARGETS="minimal-image console-image minimal-gpe-image x11-image"
 	do_build
 done
 
@@ -76,16 +77,25 @@ done
 for machine in fic-gta01 a780 
 do
 	BUILD_MACHINE=$machine
-	BUILD_TARGETS="openmoko-image"
+	BUILD_TARGETS="minimal-openmoko-image openmoko-image"
 	BUILD_CLEAN="qmake2-native"
 	do_build
 done	
 
-#native toolchain
+# populate feeds
 for machine in ep93xx a780 efika collie ixp4xxbe
 do
         BUILD_MACHINE=$machine
-        BUILD_TARGETS="gcc binutils pkgconfig make automake autoconf libtool m4 perl python gdb strace screen"
+        BUILD_TARGETS="meta-angstrom-2007"
         do_build
 done
 
+#cross toolchain
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+#        BUILD_MACHINE=$machine
+#        BUILD_TARGETS="meta-toolchain"
+#	BUILD_CLEAN="meta-toolchain"
+#        do_build
+#done
+
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index 7f84ebe4fe..1db1e19be7 100644
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Enca is an Extremely Naive Charset Analyser"
-LICENSE = "GPL2"
 SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://trific.ath.cx/software/enca/"
 PR = "r2"
 
diff --git a/packages/fbreader/fbreader_0.7.3d.bb b/packages/fbreader/fbreader_0.7.3d.bb
index 9fe9c3190c..a326180997 100644
--- a/packages/fbreader/fbreader_0.7.3d.bb
+++ b/packages/fbreader/fbreader_0.7.3d.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
diff --git a/packages/fbreader/fbreader_0.7.4q.bb b/packages/fbreader/fbreader_0.7.4q.bb
index bcea83a4a1..de2bf358a4 100644
--- a/packages/fbreader/fbreader_0.7.4q.bb
+++ b/packages/fbreader/fbreader_0.7.4q.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index ca25bdc620..fa982040f9 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "FBreader is an ebook reader"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass
index 0cb8497733..a859ac2ca9 100644
--- a/packages/glibc/eglibc-package.bbclass
+++ b/packages/glibc/eglibc-package.bbclass
@@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
-PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
 
 RPROVIDES_eglibc = "glibc"
 RPROVIDES_eglibc-utils = "glibc-utils"
@@ -210,6 +210,7 @@ python package_do_split_gconvs () {
 		f.close()
 		if deps != []:
 			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d)
 
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
@@ -261,6 +262,7 @@ python package_do_split_gconvs () {
 		else:
 			eglibc_name = name
 		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+		bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d)
 		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
 		m = re.match("(.*)_(.*)", name)
 		if m:
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index da33cca3fa..ff68185bcc 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -2,8 +2,8 @@ require glibc.inc
 
 DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
-PV = "2.6+svnr${SRCREV}"
-PR = "r1"
+PV = "2.7+svnr${SRCREV}"
+PR = "r2"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index cc69079c3a..e7875dc72e 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -7,7 +7,7 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
 	   file://69gconfd-dbus"
@@ -19,6 +19,7 @@ PARALLEL_MAKE = ""
 
 FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
 FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
 
 EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
 
diff --git a/packages/gnome/libart-lgpl/armeb/.mtn2git_empty b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/libart-lgpl/armeb/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/armeb/art_config.h b/packages/gnome/libart-lgpl/armeb/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/armeb/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb
index 1efcd793e0..204f7828f9 100644
--- a/packages/gpephone/gpe-applauncher_0.11.bb
+++ b/packages/gpephone/gpe-applauncher_0.11.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r1"
+PR          = "r2"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
@@ -18,7 +18,7 @@ inherit gpephone autotools
 SRC_URI += "file://hotkeys.conf \
             file://softkeys.conf"
 
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} = '${datadir} ${bindir}'
 FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb
index 4fe82877e3..311d2eef60 100644
--- a/packages/gpephone/gpe-applauncher_svn.bb
+++ b/packages/gpephone/gpe-applauncher_svn.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
 PV          = "0.11+svn-${SRCREV}"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
@@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config"
 SRC_URI += "file://hotkeys.conf \
             file://softkeys.conf"
 
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} = '${datadir} ${bindir}'
 FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
diff --git a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
index 6b07f78074..1b009b5380 100644
--- a/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
+++ b/packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 DESCRIPTION = "Clearlooks theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 DEPENDS = "gtk+"
 PR = "r1"
 
diff --git a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
index 68a5119aa1..d6e6de5037 100644
--- a/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
+++ b/packages/gtk-engines/gtk-industrial-engine_0.2.46.0.bb
@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 DESCRIPTION = "Industrial theme engine for GTK"
-LICENSE = "GPL2"
+LICENSE = "GPLv2"
 DEPENDS = "gtk+"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/g/gtk-industrial-engine/gtk-industrial-engine_${PV}.tar.gz \
diff --git a/packages/gtk-webcore/midori_0.0.13.bb b/packages/gtk-webcore/midori_0.0.13.bb
new file mode 100644
index 0000000000..23d0179375
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.13.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb
index 3abca0e88a..083e9a6ca1 100644
--- a/packages/lua/lua-gtk2_0.3.bb
+++ b/packages/lua/lua-gtk2_0.3.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "GTK bindings for LUA"
-LICENSE = "GPL2"
+SECTION = "libs"
 PRIORITY = "optional"
+LICENSE = "GPLv2"
 DEPENDS = "gtk+ lua-native perl-native readline libffi"
 RDEPENDS = "lua"
-SECTION = "libs"
 
 inherit gpe
 
diff --git a/packages/matchbox-keyb