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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Jan 29 09:36:38 2010 +0100

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

Conflicts:
	recipes/webkit/webkit-efl_git.bb

---