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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Dec  4 22:26:48 2009 +0100

Merge remote branch 'origin/org.openembedded.dev' into srcpv
give shr-wizard_git.bb SRCPV

Conflicts:
	recipes/ti/gstreamer-ti_svn.bb
	recipes/ti/ti-dmai.inc

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

---