merge of a03f0834b5caae5065d7445ef3fed2c8700023a8
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Jul 2005 16:48:02 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jul 2005 16:48:02 +0000 (16:48 +0000)
     and fdb811870800bdc6cab69dcfe11f49ee8958d637


Trivial merge