[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: martin_jansa/srcpv
Commit: 41f28398b7c0f1bfd9cbed1c78bc5aded298ffed
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=41f28398b7c0f1bfd9cbed1c78bc5aded298ffed

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Nov 23 21:59:28 2009 +0100

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

Conflicts:
	recipes/gnuradio/gnuradio_git.bb
	recipes/linux/linux-openmoko-2.6.31_git.bb
	recipes/linux/linux-openmoko-shr-devel_git.bb
	recipes/linux/linux-openmoko-shr-drm-devel_git.bb
	recipes/shr/e-wm-sysactions-shr_git.bb

---