merge of 145ec84e58e7acefd29711cc2431b9809b8804e9
authorRod Whitby <rod@whitby.id.au>
Wed, 20 Jul 2005 21:08:16 +0000 (21:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 21:08:16 +0000 (21:08 +0000)
     and 35b8f55d1b410a1bfaf9a685272c65e43f330691


Trivial merge