merge of 0d3287a95928eaa1b09e468ef501316c65f16248
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 22 Jul 2005 23:53:54 +0000 (23:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 23:53:54 +0000 (23:53 +0000)
commit877cd998ea0ef377ffbfcbcd6efd70ee9f88d37f
treec90dd6dd46e25d73e8d9b747cc4aaf47aac7e933
parent4f5e62451f9d7bdbbfff7e3b37afdf84e80a564c
parent6f04daf899c1100d9bb9c14cf6ccbd3fcea5b4a6
merge of 0d3287a95928eaa1b09e468ef501316c65f16248
     and bc3daa844870742c024624bb588b3a94af824c6d