merge of 7ee1ffcec438245a0a1840156021aef8230bb7e0
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 May 2006 12:57:11 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 12:57:11 +0000 (12:57 +0000)
commit13e983ea44cd0b8e1b7fc7ff6fdb892658db80ad
tree04c7e6f6b319ad3314c036e5c62367a9a7a8d0d2
parent2f58a7033eed8b93d55f28eb77e6564f4ce3cebe
parent1890a7a8cc4bf041b907f13e962cdca08f1f4fb7
merge of 7ee1ffcec438245a0a1840156021aef8230bb7e0
     and d3c6eb18e534ee6e6046f023f47fd31a50959d3b