merge of 5d9c9e1e7d8e9bfb4ecb318701b739f787d59842
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 17:16:28 +0000 (17:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 17:16:28 +0000 (17:16 +0000)
commit84ed51d67f1e2af329df0814b6a1509b71d54a28
tree4e5cb6b35219760be4770763350c45a94a9a352f
parentc9138fb90537550373f8873469af0ab74c32c965
parenta28c8d10fcfe2a7077aa7738507a03e2d51b8c63
merge of 5d9c9e1e7d8e9bfb4ecb318701b739f787d59842
     and 71481bacc3f57287881719e7dcde5ecfa6fd8492