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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar 19 12:59:06 2010 +0100

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

Conflicts:
	recipes/shr/e-wm-config-illume2-shr_git.bb

---