merge of 0877d014862bebd39f00cd33f5c60eafefbbc306
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 20:16:30 +0000 (20:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 20:16:30 +0000 (20:16 +0000)
     and 66c4a96409f67476191a2635d4577125b7dafa40


Trivial merge