merge of '9d15f77b27c19d97e354262e4913bd37bb6b02d1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 08:39:22 +0000 (08:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 08:39:22 +0000 (08:39 +0000)
     and 'e0dabd88d80820428cf042b0f89980e7027b18e6'


Trivial merge