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

[git version control]

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

Author: Thomas Zimmermann <ml at vdm-design.de>
Date:   Fri Feb 26 11:42:51 2010 +0100

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

Conflicts:
	recipes/webkit/webkit-efl_git.bb

---