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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 19 18:45:57 2009 +0100

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

Conflicts:
	recipes/disko/disko_git.bb
	recipes/efl1/elementary_svn.bb
	recipes/ffmpeg/ffmpeg_svn.bb
	recipes/freesmartphone/fsodeviced_git.bb
	recipes/linux/linux-davinci_git.bb
	recipes/openmoko-projects/openmoko-agpsui_svn.bb
	recipes/openmoko-projects/paroli_git.bb
	recipes/openmoko2/libmokoui2_svn.bb
	recipes/openmoko2/openmoko-alsa-scenarios.bb

---