merge of 0b5f03e97ed5901958ca1433116e4396100ed741
authorRod Whitby <rod@whitby.id.au>
Thu, 11 Aug 2005 11:50:46 +0000 (11:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 11:50:46 +0000 (11:50 +0000)
     and 3b73d8936075bedc6e8e8c75ad408d3e5048a832


Trivial merge