merge of '6e562962e9bd825d825465d312524f84e3e493a4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 09:04:43 +0000 (09:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 09:04:43 +0000 (09:04 +0000)
     and 'b0881da09ca99de633f27df620ac1f8e8250f288'


Trivial merge