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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr  9 21:54:42 2010 +0200

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

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

---