merge of '36622c0e93ddd6038ea1197e3ba8dc5f4ee4b748'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 01:49:07 +0000 (01:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 01:49:07 +0000 (01:49 +0000)
     and '972947ed7637fb6f7f9d628935c85322caa88d45'


Trivial merge