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)
     and 56d931179ae335695ab62d15eda788fb64824645


Trivial merge