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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar 26 11:31:11 2010 +0100

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

Conflicts:
	recipes/webkit/webkit-efl_git.bb

---