merge of 05dd4ce9d2ee0995688e45e60a21534114fbc45f
authorMichael Lauer <mickey@vanille-media.de>
Mon, 26 Sep 2005 17:07:08 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Sep 2005 17:07:08 +0000 (17:07 +0000)
commit206647fb6ccf68137a2793c913053579f4553244
tree890544ddfb2d09e31d8283e96599abfc1afa3e8e
parent2888db41c577bcce515ca6f0767ddcb3604d265a
parenta93665b6dd473d72910251d61564292ee03398f1
merge of 05dd4ce9d2ee0995688e45e60a21534114fbc45f
     and 58382d22f4140021f828ad1271f9f7700cde6b0c