merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
authorRod Whitby <rod@whitby.id.au>
Thu, 29 Jun 2006 19:46:48 +0000 (19:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 19:46:48 +0000 (19:46 +0000)
commit079a67fc75edf4d2671ed9cbef0d77870450920e
tree24e3d8ba9ee79f6eface2012d3c7922929a282ae
parent085c69220f3ab2f01fb840407815e56523544c8f
parent09f317a13d8e1ed60dd1a2d2f06db392189723e2
merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
     and 6ccfcb3e298f740c7e45b8312a95877c3f842f6d