merge of 7430926321bc8eda58a2626237cfc7553ed88d97
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Jul 2005 19:09:47 +0000 (19:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jul 2005 19:09:47 +0000 (19:09 +0000)
     and dd3df045e5a88aee7e517c086ff8c17774356ba4


Trivial merge