merge of '70bbbf8ce343203b1f290a976647fa71c21b8e15'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 11:01:32 +0000 (11:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 11:01:32 +0000 (11:01 +0000)
     and 'b5dacbd65a183748cce04d3a42790cd07da948ed'


Trivial merge