merge of 059ddb966f180b6beb2753809aff0ad72104f0cb
authorRod Whitby <rod@whitby.id.au>
Wed, 17 Aug 2005 22:36:44 +0000 (22:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 22:36:44 +0000 (22:36 +0000)
     and 90c2bc8ff57631e741bed8fa66cdfaecd2a75077


Trivial merge