merge of 0746766217f478c6eebca71d9f28cc011b491563
authorRod Whitby <rod@whitby.id.au>
Thu, 23 Feb 2006 03:11:17 +0000 (03:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 03:11:17 +0000 (03:11 +0000)
     and b8f599588572f86c26bb5cdfa1f5e89c83967e8c


Trivial merge