[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ unstable

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 740fcfffb1303fca96058a5007b6a3bb208dd476
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=740fcfffb1303fca96058a5007b6a3bb208dd476

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Apr  7 18:17:26 2010 +0200

Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/alsa/alsa-scenario_git.bb
	recipes/blipomoko/blipomoko_git.bb
	recipes/bt-configure/bt-configure_git.bb
	recipes/clutter/clutter-gtk-0.6_git.bb
	recipes/clutter/clutter-gtk-0.8_git.bb
	recipes/clutter/clutter-gtk_git.bb
	recipes/clutter/moblin-proto_git.bb
	recipes/disko/disko_git.bb
	recipes/dri/glamo-dri-tests_git.bb
	recipes/efl1/e-wm-illume-dict-pl_git.bb
	recipes/freesmartphone/dbus-hlid_git.bb
	recipes/freesmartphone/frameworkd_git.bb
	recipes/freesmartphone/fso-abyss_git.bb
	recipes/freesmartphone/fso-apm_git.bb
	recipes/freesmartphone/fso-gpsd_git.bb
	recipes/freesmartphone/fso-gsm0710muxd_git.bb
	recipes/freesmartphone/fso-monitord_git.bb
	recipes/freesmartphone/fso-sounds.bb
	recipes/freesmartphone/fso-specs_git.bb
	recipes/freesmartphone/fsodeviced_git.bb
	recipes/freesmartphone/fsomusicd_git.bb
	recipes/freesmartphone/fsonetworkd_git.bb
	recipes/freesmartphone/fsousaged_git.bb
	recipes/freesmartphone/gsmd2_git.bb
	recipes/freesmartphone/illume-theme-freesmartphone_git.bb
	recipes/freesmartphone/libframeworkd-glib_git.bb
	recipes/freesmartphone/libfso-glib_git.bb
	recipes/freesmartphone/libfsobasics_git.bb
	recipes/freesmartphone/libfsoframework_git.bb
	recipes/freesmartphone/libfsoresource_git.bb
	recipes/freesmartphone/libfsotransport_git.bb
	recipes/freesmartphone/libgsm0710_git.bb
	recipes/freesmartphone/libgsm0710mux_git.bb
	recipes/freesmartphone/libpersistence_git.bb
	recipes/freesmartphone/mdbus2_git.bb
	recipes/freesmartphone/mdbus_git.bb
	recipes/freesmartphone/mickeyterm_git.bb
	recipes/freesmartphone/msmcommd_git.bb
	recipes/freesmartphone/mterm2_git.bb
	recipes/freesmartphone/multicat_git.bb
	recipes/freesmartphone/opimd-utils_git.bb
	recipes/freesmartphone/pycd_git.bb
	recipes/freesmartphone/zhone_git.bb
	recipes/libgdbus/libgdbus_git.bb
	recipes/libgee/libgee_git.bb
	recipes/libnl/libnl2_git.bb
	recipes/libsynthesis/libsynthesis_git.bb
	recipes/linux/linux-eten_2.6.28-rc4+git.bb
	recipes/madbufferfly/madbutterfly_git.bb
	recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
	recipes/mux/mux_git.bb
	recipes/openbsc/openbsc-onwaves_git.bb
	recipes/openbsc/openbsc_git.bb
	recipes/openmoko-3rdparty/advancedcaching_git.bb
	recipes/openmoko-3rdparty/calc_git.bb
	recipes/openmoko-projects/om-locations_git.bb
	recipes/openmoko-projects/paroli_git.bb
	recipes/openmoko-projects/tichy_git.bb
	recipes/openmoocow/openmoocow_git.bb
	recipes/pidgin/msn-pecan_git.bb
	recipes/pyphonelog/pyphonelog_git.bb
	recipes/python/python-pycrypto_git.bb
	recipes/python/python-pyrtc_git.bb
	recipes/serial-utils/pty-forward-native.bb
	recipes/serial-utils/serial-forward_git.bb
	recipes/shr/e-wm-menu-shr_git.bb
	recipes/shr/e-wm-sysactions-shr_git.bb
	recipes/shr/e-wm-theme-illume-gry_git.bb
	recipes/shr/e-wm-theme-illume-niebiee_git.bb
	recipes/shr/e-wm-theme-illume-shr_git.bb
	recipes/shr/e-wm-theme-illume-sixteen_git.bb
	recipes/shr/elementary-theme-gry_git.bb
	recipes/shr/elementary-theme-niebiee_git.bb
	recipes/shr/elementary-theme-sixteen_git.bb
	recipes/shr/libmodulo_git.bb
	recipes/shr/libphone-ui-shr_git.bb
	recipes/shr/libphone-ui_git.bb
	recipes/shr/ologicd_git.bb
	recipes/shr/phonefsod_git.bb
	recipes/shr/phoneui-apps_git.bb
	recipes/shr/phoneuid_git.bb
	recipes/shr/shr-config_git.bb
	recipes/shr/shr-e-gadgets_git.bb
	recipes/shr/shr-installer_git.bb
	recipes/shr/shr-specs_git.bb
	recipes/shr/shr-splash-theme-dontpanic_git.bb
	recipes/shr/shr-splash-theme-handy_git.bb
	recipes/shr/shr-splash-theme-logo_git.bb
	recipes/shr/shr-splash-theme-niebiee_git.bb
	recipes/shr/shr-splash-theme-simple_git.bb
	recipes/shr/shr-splash-theme-tux_git.bb
	recipes/shr/shr-splash_git.bb
	recipes/shr/shr-theme-gtk-e17lookalike_git.bb
	recipes/shr/shr-theme_git.bb
	recipes/shr/shr-today_git.bb
	recipes/shr/shr-wizard_git.bb
	recipes/stopwatch/stopwatch_git.bb
	recipes/toscoterm/toscoterm_git.bb
	recipes/vala-dbus-binding-tool/vala-dbus-binding-tool_git.bb
	recipes/vala-terminal/vala-terminal_git.bb
	recipes/webkit/webkit-efl_git.bb

---