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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov 18 10:05:31 2009 +0100

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

Conflicts:
	conf/checksums.ini
	recipes/images/shr-image.inc
	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/mokomaze/mokomaze_0.5.5.bb
	recipes/webkit/webkit-efl_git.bb

---