merge of '851fb3bc90f76a09f544dfc656dab7639a1c44d8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Jan 2007 15:51:06 +0000 (15:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Jan 2007 15:51:06 +0000 (15:51 +0000)
     and 'bf66fd0535a23dbb3816e8282f71b114360bca19'


Trivial merge