merge of 5f2c5f5ba72b4c3cfbe728107dd0158e960cf154
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 30 Jul 2005 17:46:49 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 17:46:49 +0000 (17:46 +0000)
commit2e9f8dcb5e5a9a79133fa4698371407d9274d06e
tree79cb1cdf0b3a1ac1b9b50e8a193cde9e09662d9b
parent57f5ce0fcbc1b16efb95dd0c23b9cebe20be7d96
parent09da4d19b4d3475ad990c5d680514117119ca913
merge of 5f2c5f5ba72b4c3cfbe728107dd0158e960cf154
     and 652a4835aedfa3b630066ce1f9aaa47035a090e9