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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Feb 12 23:43:13 2010 +0100

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

Conflicts:
	recipes/freesmartphone/mdbus2_git.bb
	recipes/freesmartphone/mterm2_git.bb
	recipes/webkit/webkit-efl_git.bb

---