merge of 394aa1ee96c4574cc5cb238593d0bb72ed8674e6
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 23:15:58 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 23:15:58 +0000 (23:15 +0000)
commitc8ff6f27d45936d1d6932c348ce0db921a1d9d2c
tree9d37498bb7917158a27a80c6c6cd3690e156e94a
parentb0b28d7137f8aa3e4c8c6977305565879e3a4a05
parenta0c438a63cfdc04df4e2bdb800c8974d2d8cf3f8
merge of 394aa1ee96c4574cc5cb238593d0bb72ed8674e6
     and 3d296e3ebdf47d22e6d6437432ebacacb85fec05