[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: befce26ea722b8c8151a133b22b3b91e7e8771d3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=befce26ea722b8c8151a133b22b3b91e7e8771d3

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan 13 12:38:55 2010 +0100

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

Conflicts:
	recipes/libnl/libnl2_git.bb

---