merge of 153be4736bf674fd8330fb369cf0a2a6ad382473
authorJonathan McDowell <noodles@earth.li>
Tue, 8 Nov 2005 08:53:57 +0000 (08:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 08:53:57 +0000 (08:53 +0000)
commitddfdc42ce0e9c07226c1a6390b03e5df4e731902
tree7d77a3225b5c100ab3a013b2dac62eb40ad77682
parenta2152bdfee1555f88de7645e77bb9fb6ad6d5ca3
parente33d9cbbffe963c4dd3ebf22bd7b1989cddef191
merge of 153be4736bf674fd8330fb369cf0a2a6ad382473
     and 839ec3f42960c632240a938d522021359a9c136d