merge of d531cba8982784eb684baddbaad006324615e340
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 7 May 2006 17:52:53 +0000 (17:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 May 2006 17:52:53 +0000 (17:52 +0000)
     and eeb34f63bfdd65160ae264e87e5edafeea4623c6


Trivial merge