merge of 6c26951782d54ed55301a3163326a10e22bd10e9
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 17:51:19 +0000 (17:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 17:51:19 +0000 (17:51 +0000)
commitb443863746b74b37f20dffa81a0b7c7af91b51d7
treeaa7c4f1e53c78b01aed4d80fabe6e2463b7b7cf1
parent85a490438495e9fae98ef134defd11f443c177f9
parent208f7570fc3958419cf514c4ad1ecd14bfdd6562
merge of 6c26951782d54ed55301a3163326a10e22bd10e9
     and b26ab6bc6ece875def13c510fae8f95b218a94fb