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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Nov 20 11:01:50 2009 +0100

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

Conflicts:
	recipes/linux/linux-openmoko-shr-drm-devel_git.bb

---