[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git.openembedded.org: openembedded into martin_jansa/srcpv

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 41d25826e9e1ded263fe275a371776a932eb7184
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=41d25826e9e1ded263fe275a371776a932eb7184

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Nov 24 21:21:22 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/libnl/libnl2_git.bb
	recipes/webkit/webkit-efl_git.bb

---