[oe-commits] Graeme Gregory : Merge branch 'org.openembedded.dev' of git at git. openembedded.net:openembedded into shared/xorg-7.4-update

[GIT User account]

Module: openembedded.git
Branch: shared/xorg-7.4-update
Commit: f967f8007019d7692b68ea02bd3f2edb566ce519
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f967f8007019d7692b68ea02bd3f2edb566ce519

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Sun Nov  9 10:57:51 2008 +0000

Merge branch 'org.openembedded.dev' of git at git.openembedded.net:openembedded into shared/xorg-7.4-update

Conflicts:

	conf/checksums.ini

---