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

[git version control]

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

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

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

Conflicts:
	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

---