merge of 2d151a396c36bdb08948d221edbf6c5391eaf067
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 10 Oct 2005 12:48:25 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Oct 2005 12:48:25 +0000 (12:48 +0000)
     and d72f9e2df6f619bf150275a643da358b708c3bdd


Trivial merge