merge of 3ebe797f95e18373ceff83c1e02dad29ccdb7c62
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 26 Aug 2005 10:16:56 +0000 (10:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 10:16:56 +0000 (10:16 +0000)
     and 80cd2f23fa30933cc5cedf9ed85a22dc3eb0e2a9


Trivial merge