merge of 65b0cd64eeef02b789460148d6bb958749417f11
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 00:16:26 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 00:16:26 +0000 (00:16 +0000)
     and fe9207286fe795f141cfced1550795b360e1e971


Trivial merge