merge of 287509423a7ccc469c088f6b92bbdfec0edeadee
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 14 Aug 2005 14:50:12 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 14:50:12 +0000 (14:50 +0000)
commit285312fd74ae999433d163dff3e63bb194224571
tree13c9cd5ffc0a418fad756c866697bbaa1d3621e1
parent1a8447cc2198d81d71b1758a18da50dd6e823f28
parent029999acbb7522240c0697332d18218332e13866
merge of 287509423a7ccc469c088f6b92bbdfec0edeadee
     and 407eb0296d350c9cc97e2b25538dc773ded42ce9