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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Nov 17 21:23:31 2009 +0100

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

Conflicts:
	recipes/e17/e-wm_svn.bb
	recipes/efl1/elementary_svn.bb
	recipes/efl1/emotion_svn.bb
	recipes/efl1/libefso_svn.bb
	recipes/ffmpeg/ffmpeg_svn.bb
	recipes/matchbox2/matchbox-panel-2_svn.bb
	recipes/openmoko-projects/openmoko-agpsui_svn.bb
	recipes/openmoko2/libmokoui2_svn.bb
	recipes/openmoko2/openmoko-alsa-scenarios.bb
	recipes/opkg/opkg.inc

---