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

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Mon Jun  1 23:10:54 2009 +0100

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

Conflicts:
	recipes/gnuradio/gnuradio_svn.bb
	recipes/openmoko2/libjana_svn.bb

---