merge of 299d7ad50c11e98b4229b447db0f230399d5b808
authorMichael Lauer <mickey@vanille-media.de>
Sun, 7 Aug 2005 21:12:42 +0000 (21:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 21:12:42 +0000 (21:12 +0000)
commit2a1348f4d4469c2a0cb820172c5762644652ace6
treebc67f6c5d87f7d8d8fbf1a2675799ed6500fb66b
parentc93d0812f0e5b859d3bdb45810b068d83639a021
parenta6c24a45526c39e2cdcb51370829b5c2f283e178
merge of 299d7ad50c11e98b4229b447db0f230399d5b808
     and eadb0128d53a398e63b8038f387db6940e12a469