merge of d17f60969b9aa66d7e2a10b01b1b2712c739a936
authorRod Whitby <rod@whitby.id.au>
Thu, 9 Feb 2006 00:58:37 +0000 (00:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Feb 2006 00:58:37 +0000 (00:58 +0000)
commit83de9cc7b6dcc7447f14d9361b37317297968047
tree8bacd716ece0b6c2d13f1f1777047cff0fcf7344
parent8bf7fc815aa4f798990d3a117e902f4cf9b17380
parent923e4a811754c19101be911843ede1e5e7c6a19e
merge of d17f60969b9aa66d7e2a10b01b1b2712c739a936
     and f3b5ec0f8fb17f8309020cc990163b2a4440edff