merge of '11ca7ff0d1de076bbdbc992cd8000979481f9ab7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 21:41:37 +0000 (21:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 21:41:37 +0000 (21:41 +0000)
     and 'dcdf37dd5cff1f2afac0d3847f56301b4ae82c89'


Trivial merge