merge of 2da9b96cdb36ca182caf27f836faef1078572f95
authorGraeme Gregory <dp@xora.org.uk>
Tue, 30 May 2006 14:23:59 +0000 (14:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 May 2006 14:23:59 +0000 (14:23 +0000)
     and 47d0a86844b0af01207eaf860b38e3902c54e12c


Trivial merge