merge of '1cd5e943ef54d13e64d37d770a002c30566c92aa'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 18:15:19 +0000 (18:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 18:15:19 +0000 (18:15 +0000)
     and 'a139347e51e6031cfc0bad60233a7c2d122eb2b0'


Trivial merge