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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Apr  1 13:52:16 2010 +0200

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

Conflicts:
	recipes/e17/illume-keyboards-shr_git.bb

---