merge of 376552a598ef9a388d419ca16b2aa113cd923ffa
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 20:46:36 +0000 (20:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 20:46:36 +0000 (20:46 +0000)
     and 4af8f96da30c305dfbb250541de315cdfc0e5ec1


Trivial merge