[oe-commits] Graeme Gregory : Merge branch 'org.openembedded.dev' of git+ssh://git at git. openembedded.org/openembedded into xora/angstrom-srcpv

[git version control]

Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: 438b5ead963a217f27ced985dc0e06daf040ea78
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=438b5ead963a217f27ced985dc0e06daf040ea78

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Wed Jun 10 19:18:52 2009 +0100

Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into xora/angstrom-srcpv

Conflicts:
	recipes/tslib/tslib_svn.bb

---