merge of '2e808e7d7d04be00150c9a9ed0384baa6c7114f1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 14:14:00 +0000 (14:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 14:14:00 +0000 (14:14 +0000)
     and '88fc6a7d5e7c17322b154bdd942535cbca085e18'


Trivial merge