[oe-commits] Klaus Kurzmann : Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/srcpv

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 36320222902e1dfff6af0cc4e52cceef8afe8030
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=36320222902e1dfff6af0cc4e52cceef8afe8030

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Dec  5 19:35:12 2009 +0100

Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/srcpv

Conflicts:
	recipes/efl1/illume-keyboard-arabic_git.bb
	recipes/efl1/illume-keyboard-browse_git.bb
	recipes/efl1/illume-keyboard-danish_git.bb
	recipes/efl1/illume-keyboard-default-alt_git.bb
	recipes/efl1/illume-keyboard-dutch_git.bb
	recipes/efl1/illume-keyboard-dvorak_git.bb
	recipes/efl1/illume-keyboard-french_git.bb
	recipes/efl1/illume-keyboard-german_git.bb
	recipes/efl1/illume-keyboard-hebrew_git.bb
	recipes/efl1/illume-keyboard-numeric-alt_git.bb
	recipes/efl1/illume-keyboard-russian-terminal_git.bb
	recipes/efl1/illume-keyboard-russian_git.bb
	recipes/openmoko-projects/om-locations_git.bb
	recipes/shr/libframeworkd-phonegui-efl2_git.bb
	recipes/shr/libframeworkd-phonegui-efl_git.bb
	recipes/shr/libphone-ui-shr_git.bb
	recipes/shr/shr-config_git.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---