merge of 90995c6a84b1333e5f3afd4db97b6790bd49ad14
authorRod Whitby <rod@whitby.id.au>
Wed, 10 Aug 2005 19:31:25 +0000 (19:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 19:31:25 +0000 (19:31 +0000)
     and 9736854d172591bb17c9228e6cb15b4fc9791c29


Trivial merge