merge of 542f6b46587305352d62fe667186ce8ecb2b961f
authorRod Whitby <rod@whitby.id.au>
Fri, 2 Dec 2005 10:33:21 +0000 (10:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 10:33:21 +0000 (10:33 +0000)
     and beb867c2b9c7cc5d33068e9a46974e7650287391


Trivial merge