merge of '333e287567474447d260204effba70e5e0c2eb71'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 17 Jun 2008 18:44:39 +0000 (18:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 17 Jun 2008 18:44:39 +0000 (18:44 +0000)
     and 'f0144e2c5085d88cf1861c146d6e33c2653a222e'


Trivial merge