Merge branch 'shared/xorg-7.4-update' into org.openembedded.dev
authorGraeme Gregory <dp@xora.org.uk>
Wed, 12 Nov 2008 16:20:40 +0000 (16:20 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 12 Nov 2008 16:20:40 +0000 (16:20 +0000)

Trivial merge