merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 14 Jan 2006 08:45:40 +0000 (08:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 08:45:40 +0000 (08:45 +0000)
commit0f93bc82fd506c282aa963e0b4ed5de8412b9695
tree211c0cce46e7e2f05e97c6a27e7c7c6045b7ea62
parentcda660808fbc381cc11fb9ceb3cd0cde13c239d7
parent834e0aaa9e5048ca1872a7022ddb639fa15a2f18
merge of d3538e5f45f69d0b65a1d425359ba88009d3ef91
     and e7693771f829a9afffa119fcdc723d562cbb94fa