merge of 59a26e4bc6be5d4a3bf6f7604ed3be4c535d7ced
authorRod Whitby <rod@whitby.id.au>
Tue, 10 Jan 2006 10:00:22 +0000 (10:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 10:00:22 +0000 (10:00 +0000)
commit18a1d5d645ec319bd93ceb684517125e085d9c52
tree3a40ee2784221afeaf62ab9fbb4f576eb43f70b4
parent1905138fc23ebb7557d28e6b47d9a25488b645b9
parent230e1cbcf09ae018a56c7389904d9bba8c6452ee
merge of 59a26e4bc6be5d4a3bf6f7604ed3be4c535d7ced
     and eecdb83ac8464beff7f6584c6e739f30ba91e43d