merge of 12aa0c8ab97e48e880104ae70099396cfec730d0
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 17:28:05 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 17:28:05 +0000 (17:28 +0000)
commit900015f63bd5445f2895ded7b6972026528f29cb
tree10a52c5cb2bf032b44be28e9026c134bb4e37d24
parent29b7baee5177b23d883d8273e0d723cab3b2106c
parent5f8a9f68cf27bc34905cd5e8cb5e98705979f6a7
merge of 12aa0c8ab97e48e880104ae70099396cfec730d0
     and 91a1b03bc990317ac44a440b58f5e1b171fc7234