merge of d82f1294da436f4c180db853fffef16a6b811b28
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Apr 2006 08:12:39 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 08:12:39 +0000 (08:12 +0000)
commit13aaf9747432dbad3420fc238e2765cf493ee78b
tree9605f7681de7ff7f126681db97f0d1789340a94e
parent9e2aff98b4ef3ab00538ff471ac7de5ad37ae59f
parent6dfcbcba29c102ae5e2965aa77f96f75e6e5b880
merge of d82f1294da436f4c180db853fffef16a6b811b28
     and d9f2b0cf0a3d1cb9bda168d3802b0398efb83db9