merge of 830a2ca2c9484467078002caaef98f80db84c191
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 10:37:45 +0000 (10:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 10:37:45 +0000 (10:37 +0000)
commit4dbac5bc4465261136bca6e3b9b2c35ddab50174
treea76bd07fe80dff6f967c3ff5955bd936503cb09d
parentfab0d798c878034880b1a072684d1a0526ef7090
parent02a7ba97f61e2d7ec73013612472307f0d9a8b34
merge of 830a2ca2c9484467078002caaef98f80db84c191
     and a5073c2c09ef06e7875d4a30ddfdb0a9b8bd58f3