merge of '2c36c1352880077becd0896d3b153e75f8b5f0ac'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 19:19:11 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 May 2008 19:19:11 +0000 (19:19 +0000)
     and 'a9d44faec0ce331d83a20afa025ec1454530c6bb'


Trivial merge