merge of '6176297db9843a4ee2b5a46d8c099ac11f0efdd6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:26:20 +0000 (16:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:26:20 +0000 (16:26 +0000)
     and 'dd033c24f26b4f017ce97d2ca4593a7f74187445'


Trivial merge