merge of 0cca75bf60d8910a9f3746cfcf54fae56e50a758
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 22:00:25 +0000 (22:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 22:00:25 +0000 (22:00 +0000)
commit99ae9abc58d3e9ddbcca446101d0dace838c464d
tree3a95f3ddb3803ce0e1d3616423d1696fe0d439c7
parent511684d214520a8bd7f9b95ca0ffce860009d6f2
parentb6079b6c268d8df773e42a191f12c9afcd17d1c6
merge of 0cca75bf60d8910a9f3746cfcf54fae56e50a758
     and 84cacf0306830aa7f116a84e41a65ab4e2d8a7b9