merge of 11d6bd95a0db23f96eb6c52d8212e35447cb7a4c
authorRod Whitby <rod@whitby.id.au>
Thu, 1 Dec 2005 18:31:43 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 18:31:43 +0000 (18:31 +0000)
commit137af3e75ed807afa7e76a6b6052663ecd539b93
treeef8ed1e05214b64c23936aedaec28b3f8fe92e5b
parent1bb2e5b87e1c3b03641dfcf4d6ee90ea3db8bc49
parenteaca434fff6601f976edc7ff0e2f75ee45fc619a
merge of 11d6bd95a0db23f96eb6c52d8212e35447cb7a4c
     and 4b8efd8ea23df73f8397284e81b3d7ba92173f77