merge of d17f60969b9aa66d7e2a10b01b1b2712c739a936
authorRod Whitby <rod@whitby.id.au>
Thu, 9 Feb 2006 00:58:37 +0000 (00:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Feb 2006 00:58:37 +0000 (00:58 +0000)
     and f3b5ec0f8fb17f8309020cc990163b2a4440edff


Trivial merge