merge of 20908dd2ac3934b841281cc067b55d92b071b172
authorDerek Young <dyoung@nslu2-linux.org>
Mon, 29 Aug 2005 22:32:24 +0000 (22:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 22:32:24 +0000 (22:32 +0000)
commit051377aaefcf249db0602a0ea3800b0aa73a85fd
treeb085398e135c53104822185c39eb0c2cc01e910e
parentbe7329be872d38a4d6cd94b33da655276ec4a681
parentac9aa71d0d9d36ae6cd07f37c50d6992e384cb29
merge of 20908dd2ac3934b841281cc067b55d92b071b172
     and d05618e2ffb76c986540067b57ddf9113d582627