merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 03:24:12 +0000 (03:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 03:24:12 +0000 (03:24 +0000)
commit2427fe5ac44f39555ca3b1fee8e0a234917cbe96
tree645d2eb99781cb79ea1ddf3514b29cef996b4ea1
parent931b88d4f952a2fbba63d9cbfbe6e5816cacfa95
parent8bc640253e3402ed705484106527fa8f437e99e8
merge of 050df893918bae2f4a6a2cb3fcdc9f0ee8e8ee04
     and 1819e7c9879b392cfb2bdae2cd3d9d59c7e28a49