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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Nov 21 16:16:28 2009 +0100

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

Conflicts:
	recipes/gnuradio/gnuradio_git.bb
	recipes/shr/e-wm-sysactions-shr_git.bb

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

---