merge of 4bd9a63f8807f4b1963f6fc396e9807603315627
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 2 Sep 2005 11:17:08 +0000 (11:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 11:17:08 +0000 (11:17 +0000)
commit8c17b9f55ac71ac77c90c5e42e2ee4ab063fa1cb
treef86c4ddba51e50a849657cee40b4fd2de59eb80d
parent5ed5634d5b92df2bc2a4023136b4cbcc2642b97b
parentf93c784435e67299aecd58dd9eb85b51b52c681d
merge of 4bd9a63f8807f4b1963f6fc396e9807603315627
     and b144329bc02b11109562f08443c2ce7a241f9d1f