merge of '2f6abf8a8680eb4022df3fdd9155c50c7296e7ca'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 15:29:39 +0000 (15:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 15:29:39 +0000 (15:29 +0000)
     and 'e884d7c108c70175d833d54e506030552e394e44'


Trivial merge