[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git.openembedded.org: openembedded into martin_jansa/srcpv

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Nov 20 13:46:58 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/freesmartphone/fso-apm_git.bb
	recipes/linux/linux-openmoko-shr-drm-devel_git.bb
	recipes/webkit/webkit-efl_git.bb

---