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

[GIT User account]

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

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Sun May 17 22:18:51 2009 +0100

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

Conflicts:
	recipes/gtk-webcore/midori_git.bb

---