merge of 4eb0069c0706d720a42374a8bbcc4d6ac526efd5
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 3 Aug 2005 08:30:16 +0000 (08:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 08:30:16 +0000 (08:30 +0000)
     and d7476af0a51ef4a0048463666c25b012e70d5c7d


Trivial merge