merge of acedaefff26954cb3841217cd873a7f0336de1f1
authorRod Whitby <rod@whitby.id.au>
Fri, 29 Jul 2005 10:00:18 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 10:00:18 +0000 (10:00 +0000)
     and faa2fa21cd8b3913cea3925dafd04edf752bca02


Trivial merge