merge of a7533fe1dde530db43cb0e31307632437139f2af
authorJustin Patrin <papercrane@gmail.com>
Tue, 4 Apr 2006 17:37:36 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 17:37:36 +0000 (17:37 +0000)
commita4472a7d1c2687e2dad791557ba3a63bcb7281ce
treeffb755994a8d75029fa755fd25796aab20f05196
parentc121ca2c7e3e41472a4c4e2837cac69c76df5a53
parent1e67ef797eb4c215540856dec5493e5a8c8dbb03
merge of a7533fe1dde530db43cb0e31307632437139f2af
     and d48f265f263a5f969f2abfd913a09b91a51a701f