merge of 'f0d37b436d1ce39437b94acd261109f04af36c38'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 00:26:11 +0000 (00:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 00:26:11 +0000 (00:26 +0000)
     and 'fe78c09ce0a1dbc69ac1b86f04d530c6790e6651'


Trivial merge