merge of 868e3092c931e12c4f9d694ad7df1311a37a82fd
authorRod Whitby <rod@whitby.id.au>
Thu, 13 Apr 2006 13:06:22 +0000 (13:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Apr 2006 13:06:22 +0000 (13:06 +0000)
commit77a6f4f731f2b331f03f491ba28c4795555bac32
tree1e2a72274600c1c624143ad0fb924eb0a9989387
parent76f0fff10ab49dd36440499cd1b2304840d150d7
parent2a5cc04f1a106d2d531ebaef81331fdba92d241b
merge of 868e3092c931e12c4f9d694ad7df1311a37a82fd
     and 4813ca2ee55d62f418589078bde8c65471daf1c4