merge of '0c1609602324e53bbaa1c371330798fbeb1adaec'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Sep 2008 12:31:11 +0000 (12:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Sep 2008 12:31:11 +0000 (12:31 +0000)
     and '4375f1c5c294da70172d3a0d99da040cb85d66fd'


Trivial merge