merge of 12c8ec6ea03d7bf942717daba4cc06fd518965c0
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 May 2006 22:20:00 +0000 (22:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 May 2006 22:20:00 +0000 (22:20 +0000)
commitac0214c0b84b53bc043ef643ff7857d3cce8d54e
tree1f5f29535c31a0221163636094037fdb4f4c6952
parent7376a30cd75ea618f47a39bf084dd73829a93bea
parent5c2b9eec4c66370c8e287766d522c168ceb28fc2
merge of 12c8ec6ea03d7bf942717daba4cc06fd518965c0
     and f46af8d8602581214b59314f71fbd9fcdfda0fef