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

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Tue Nov 11 12:30:57 2008 +0000

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

Conflicts:

	packages/xorg-driver/xf86-input-tslib_0.0.5.bb

---