merge of 38a9824230c1f33aa1b69405d1a6074d1df99753
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Aug 2005 16:40:05 +0000 (16:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 16:40:05 +0000 (16:40 +0000)
commitef4409bc8d3c40b3ba39d2fe4c91e68785bbd419
treefa9776f473f438140f6ea852e0d12967624a7beb
parent1e9f32efa15fcc6649119f0c4c398b3405f6b9c0
parentf3ead211477be5319bbb8cb5a983e6ec68dd2a23
merge of 38a9824230c1f33aa1b69405d1a6074d1df99753
     and d83e77353ac4cf240e630aa66aa54eb794547a60