merge of 769a800deeefc4e439b5bc9c6cf9abd2a6dde254
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 02:32:30 +0000 (02:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 02:32:30 +0000 (02:32 +0000)
     and 918d376ebc00bbed8c1aa2ba0e64dfde3039bb16


Trivial merge