merge of 775b8969c1dd2afd0f16f9d2b27219b0d07bbe25
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Dec 2005 10:11:23 +0000 (10:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 10:11:23 +0000 (10:11 +0000)
     and a0d07ed54f83502dfe281ee4cd5eeafbe00ac68b


Trivial merge