merge of 7893ffcc366c146ed8222f1853a05c48f8988a4e
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 02:45:26 +0000 (02:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 02:45:26 +0000 (02:45 +0000)
     and 9ef371d5ab888cd926919c7bf505d283e4f19f54


Trivial merge