merge of 6c26951782d54ed55301a3163326a10e22bd10e9
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 17:51:19 +0000 (17:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 17:51:19 +0000 (17:51 +0000)
     and b26ab6bc6ece875def13c510fae8f95b218a94fb


Trivial merge