merge of 439207523733c6dc2f0ffd852ac72717fc3f50a6
authorRod Whitby <rod@whitby.id.au>
Thu, 29 Jun 2006 19:47:18 +0000 (19:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 19:47:18 +0000 (19:47 +0000)
commit4e26f686b6c18fe1f57bb20d5edfa81699377ee1
tree524fd1084d769db260077de427ed799f2060eb0d
parentb4bb893ec2ad5251d461916703576a8295b1d513
parent079a67fc75edf4d2671ed9cbef0d77870450920e
merge of 439207523733c6dc2f0ffd852ac72717fc3f50a6
     and 7847e7c8b41faf980a8a08156c7c8a5bc616f814