[oe-commits] Klaus Kurzmann : Merge branch 'martin_jansa/srcpv' into shr/merge

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Tue Dec 15 14:48:49 2009 +0100

Merge branch 'martin_jansa/srcpv' into shr/merge

Conflicts:
	conf/distro/include/angstrom-2008-preferred-versions.inc
	recipes/uclibc/uclibc_nptl.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---