merge of 233aad18afe0317b0afc6e143e39d9294ecaac1c
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 18:16:58 +0000 (18:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 18:16:58 +0000 (18:16 +0000)
commit6ffd2eda32dbedc9afea7dadf537f7fc50c47e5b
tree392af44cd5db9b590da4a9ff31959f1e82346a74
parente25c3f5d7a7ac6fbaeb58aa654a0369a70952444
parent84ed51d67f1e2af329df0814b6a1509b71d54a28
merge of 233aad18afe0317b0afc6e143e39d9294ecaac1c
     and 56d931179ae335695ab62d15eda788fb64824645